diff --git a/FASTSTART.md b/FASTSTART.md
index a9504b1b106a202dd1bff9994cf7ad72ab4abdcf..00b60a9615e208abee843a7df2d622ff0c4d38a7 100644
--- a/FASTSTART.md
+++ b/FASTSTART.md
@@ -182,11 +182,13 @@
     log4j.appender.L=com.plumelog.log4j.appender.KafkaAppender
     #appName系统的名称(自己定义就好)
     log4j.appender.L.appName=plumelog
+    log4j.appender.L.env=${spring.profiles.active}
     log4j.appender.L.kafkaHosts=172.16.247.143:9092,172.16.247.60:9092,172.16.247.64:9092
     #redis做为中间件
 
     log4j.appender.L=com.plumelog.log4j.appender.RedisAppender
     log4j.appender.L.appName=plumelog
+    log4j.appender.L.env=${spring.profiles.active}
     log4j.appender.L.redisHost=172.16.249.72:6379
     #redis没有密码这一项为空或者不需要
     #log4j.appender.L.redisAuth=123456
diff --git a/plumelog-core/src/main/java/com/plumelog/core/dto/BaseLogMessage.java b/plumelog-core/src/main/java/com/plumelog/core/dto/BaseLogMessage.java
index 343bcc8e500feb021e8595b5554dbdce720a72ed..0be758e8aa21de39f1fda0ad345d2e63b0c1f71d 100644
--- a/plumelog-core/src/main/java/com/plumelog/core/dto/BaseLogMessage.java
+++ b/plumelog-core/src/main/java/com/plumelog/core/dto/BaseLogMessage.java
@@ -23,7 +23,12 @@ public class BaseLogMessage {
      * 应用名
      */
     private String appName;
-
+    
+    /**
+     * 应用环境
+     */
+    private String env;
+    
     /**
      * 方法名
      */
@@ -44,7 +49,15 @@ public class BaseLogMessage {
     public void setAppName(String appName) {
         this.appName = appName;
     }
-
+    
+    public void setEnv(String env) {
+        this.env = env;
+    }
+    
+    public String getEnv() {
+        return env;
+    }
+    
     public String getMethod() {
         return method;
     }
@@ -60,4 +73,8 @@ public class BaseLogMessage {
     public void setServerName(String serverName) {
         this.serverName = serverName;
     }
+    
+    public String getAppNameWithEnv() {
+        return this.appName + "-_-" + this.env;
+    }
 }
diff --git a/plumelog-core/src/main/java/com/plumelog/core/dto/WarningRule.java b/plumelog-core/src/main/java/com/plumelog/core/dto/WarningRule.java
index ada523a2843c289ed7319d6b059ea91a06057b19..6d829dd1300f65239676281b4ef43f9cffef38bc 100644
--- a/plumelog-core/src/main/java/com/plumelog/core/dto/WarningRule.java
+++ b/plumelog-core/src/main/java/com/plumelog/core/dto/WarningRule.java
@@ -11,6 +11,7 @@ package com.plumelog.core.dto;
 public class WarningRule {
 
     private String appName;
+    private String env;
     private String appCategory;
     private String className;
     private String receiver;
@@ -27,7 +28,15 @@ public class WarningRule {
     public void setAppName(String appName) {
         this.appName = appName;
     }
-
+    
+    public String getEnv() {
+        return env;
+    }
+    
+    public void setEnv(String env) {
+        this.env = env;
+    }
+    
     public String getAppCategory() {
         return appCategory;
     }
diff --git a/plumelog-core/src/main/java/com/plumelog/core/dto/WarningRuleDto.java b/plumelog-core/src/main/java/com/plumelog/core/dto/WarningRuleDto.java
index 4cf1aaaa1587716487b32e1597343ac69d738fb1..413a57b4c5262a6b9c5d5d7746c5ff1c3cda8a66 100644
--- a/plumelog-core/src/main/java/com/plumelog/core/dto/WarningRuleDto.java
+++ b/plumelog-core/src/main/java/com/plumelog/core/dto/WarningRuleDto.java
@@ -1,7 +1,5 @@
 package com.plumelog.core.dto;
 
-import com.plumelog.core.dto.WarningRule;
-
 /**
  * className：WarningRule
  * description：错误告警规则
diff --git a/plumelog-core/src/main/java/com/plumelog/core/util/TraceLogMessageFactory.java b/plumelog-core/src/main/java/com/plumelog/core/util/TraceLogMessageFactory.java
index 6e6b503c95d55c9d8c2dc253e77c3ac3d6ac02a9..ce4940c467cc3d77d4cf7493bd13abd92ec11c8a 100644
--- a/plumelog-core/src/main/java/com/plumelog/core/util/TraceLogMessageFactory.java
+++ b/plumelog-core/src/main/java/com/plumelog/core/util/TraceLogMessageFactory.java
@@ -14,10 +14,11 @@ import com.plumelog.core.TraceMessage;
  * @version 1.0.0
  */
 public class TraceLogMessageFactory<T> {
-
-    public static TraceLogMessage getTraceLogMessage(TraceMessage traceMessage, String appName, long time) {
+    
+    public static TraceLogMessage getTraceLogMessage(TraceMessage traceMessage, String appName, String env, long time) {
         TraceLogMessage traceLogMessage = new TraceLogMessage();
         traceLogMessage.setAppName(appName);
+        traceLogMessage.setEnv(env);
         traceLogMessage.setTraceId(traceMessage.getTraceId());
         traceLogMessage.setMethod(traceMessage.getMessageType());
         traceLogMessage.setTime(time);
@@ -26,24 +27,25 @@ public class TraceLogMessageFactory<T> {
         traceLogMessage.setServerName(IpGetter.CURRENT_IP);
         return traceLogMessage;
     }
-
-    public static RunLogMessage getLogMessage(String appName, String message, long time) {
+    
+    public static RunLogMessage getLogMessage(String appName, String env, String message, long time) {
         RunLogMessage logMessage = new RunLogMessage();
         logMessage.setServerName(IpGetter.CURRENT_IP);
         logMessage.setAppName(appName);
+        logMessage.setEnv(env);
         logMessage.setContent(message);
         logMessage.setDtTime(time);
         logMessage.setTraceId(TraceId.logTraceID.get());
         return logMessage;
     }
-
+    
     public static String packageMessage(String message, Object[] args) {
         StringBuilder builder = new StringBuilder(128);
         builder.append(message);
-        for (int i = 0; i < args.length; i++) {
-            builder.append("\n").append(args[i]);
+        for (Object arg : args) {
+            builder.append("\n").append(arg);
         }
         return builder.toString();
     }
-
+    
 }
diff --git a/plumelog-log4j/src/main/java/com/plumelog/log4j/appender/KafkaAppender.java b/plumelog-log4j/src/main/java/com/plumelog/log4j/appender/KafkaAppender.java
index b313a2888e234b895c0d589c2f991e750dc55a90..699c5b1b9e1319d2c3d5bac12b16f80991ff4048 100644
--- a/plumelog-log4j/src/main/java/com/plumelog/log4j/appender/KafkaAppender.java
+++ b/plumelog-log4j/src/main/java/com/plumelog/log4j/appender/KafkaAppender.java
@@ -23,11 +23,12 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class KafkaAppender extends AppenderSkeleton {
     private KafkaProducerClient kafkaClient;
     private String appName;
+    private String env = "default";
     private String kafkaHosts;
     private String runModel;
-    private int maxCount=100;
-    private int logQueueSize=10000;
-    private int threadPoolSize=1;
+    private int maxCount = 100;
+    private int logQueueSize = 10000;
+    private int threadPoolSize = 1;
     private boolean compressor = false;
 
     public void setAppName(String appName) {
@@ -57,28 +58,32 @@ public class KafkaAppender extends AppenderSkeleton {
     public void setCompressor(boolean compressor) {
         this.compressor = compressor;
     }
-
-    private static ThreadPoolExecutor threadPoolExecutor
-            = ThreadPoolUtil.getPool();
+    
+    public void setEnv(String env) {
+        this.env = env;
+    }
+    
+    private static ThreadPoolExecutor threadPoolExecutor = ThreadPoolUtil.getPool();
+    
     @Override
     protected void append(LoggingEvent loggingEvent) {
-        if(this.runModel!=null){
-            LogMessageConstant.RUN_MODEL=Integer.parseInt(this.runModel);
+        if (this.runModel != null) {
+            LogMessageConstant.RUN_MODEL = Integer.parseInt(this.runModel);
         }
         if (this.kafkaClient == null) {
             this.kafkaClient = KafkaProducerClient.getInstance(this.kafkaHosts, this.compressor ? "lz4" : "none");
             MessageAppenderFactory.initQueue(this.logQueueSize);
-            for(int a=0;a<this.threadPoolSize;a++){
+            for (int a = 0; a < this.threadPoolSize; a++) {
 
-                threadPoolExecutor.execute(()->{
-                    MessageAppenderFactory.startRunLog(this.kafkaClient,maxCount);
+                threadPoolExecutor.execute(() -> {
+                    MessageAppenderFactory.startRunLog(this.kafkaClient, maxCount);
                 });
-                threadPoolExecutor.execute(()->{
-                    MessageAppenderFactory.startTraceLog(this.kafkaClient,maxCount);
+                threadPoolExecutor.execute(() -> {
+                    MessageAppenderFactory.startTraceLog(this.kafkaClient, maxCount);
                 });
             }
         }
-        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(this.appName, loggingEvent);
+        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(this.appName, this.env, loggingEvent);
         if (logMessage instanceof RunLogMessage) {
             final String message = LogMessageUtil.getLogMessage(logMessage, loggingEvent);
             MessageAppenderFactory.pushRundataQueue(message);
diff --git a/plumelog-log4j/src/main/java/com/plumelog/log4j/appender/RedisAppender.java b/plumelog-log4j/src/main/java/com/plumelog/log4j/appender/RedisAppender.java
index 7b81a64162a2b7048c2abfae37ce3e9f7d918b38..618de5060488a0cba12ad05a1ecfb650246b0e84 100644
--- a/plumelog-log4j/src/main/java/com/plumelog/log4j/appender/RedisAppender.java
+++ b/plumelog-log4j/src/main/java/com/plumelog/log4j/appender/RedisAppender.java
@@ -14,7 +14,6 @@ import com.plumelog.core.redis.RedisClient;
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.spi.LoggingEvent;
 
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 
 /**
@@ -27,6 +26,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class RedisAppender extends AppenderSkeleton {
     private AbstractClient redisClient;
     private String appName;
+    private String env = "default";
     private String redisHost;
     private String redisPort;
     private String redisAuth;
@@ -94,34 +94,43 @@ public class RedisAppender extends AppenderSkeleton {
     public void setMasterName(String masterName) {
         this.masterName = masterName;
     }
-
-    private static ThreadPoolExecutor threadPoolExecutor
-            = ThreadPoolUtil.getPool();
-
+    
+    public void setEnv(String env) {
+        this.env = env;
+    }
+    
+    private static ThreadPoolExecutor threadPoolExecutor = ThreadPoolUtil.getPool();
+    
     @Override
     protected void append(LoggingEvent loggingEvent) {
         if (this.runModel != null) {
             LogMessageConstant.RUN_MODEL = Integer.parseInt(this.runModel);
         }
         if (this.redisClient == null) {
-            if (this.model.equals("cluster")) {
+            if ("cluster".equals(this.model)) {
                 this.redisClient = RedisClusterClient.getInstance(this.redisHost, this.redisAuth);
-            } else if (this.model.equals("sentinel")) {
-                this.redisClient = RedisSentinelClient.getInstance(this.redisHost, this.masterName, this.redisAuth, this.redisDb);
+            } else if ("sentinel".equals(this.model)) {
+                this.redisClient = RedisSentinelClient
+                        .getInstance(this.redisHost, this.masterName, this.redisAuth, this.redisDb);
             } else {
                 int port = 6379;
                 String ip = "127.0.0.1";
-                if(this.redisPort==null){
-                    String[] hs = redisHost.split(":");
-                    if (hs.length == 2) {
-                        ip = hs[0];
-                        port = Integer.valueOf(hs[1]);
+                if (this.redisPort == null) {
+                    // 如果redisHost不包含:号则端口号默认使用6379
+                    if (redisHost.contains(":")) {
+                        String[] hs = redisHost.split(":");
+                        if (hs.length == 2) {
+                            ip = hs[0];
+                            port = Integer.parseInt(hs[1]);
+                        }
+                    } else {
+                        ip = this.redisHost;
                     }
-                }else {
-                    ip=this.redisHost;
-                    port=Integer.parseInt(this.redisPort);
+                } else {
+                    ip = this.redisHost;
+                    port = Integer.parseInt(this.redisPort);
                 }
-                this.redisClient = RedisClient.getInstance(ip,port,this.redisAuth, this.redisDb);
+                this.redisClient = RedisClient.getInstance(ip, port, this.redisAuth, this.redisDb);
             }
 
             MessageAppenderFactory.initQueue(this.logQueueSize);
@@ -137,7 +146,7 @@ public class RedisAppender extends AppenderSkeleton {
                 });
             }
         }
-        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(this.appName, loggingEvent);
+        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(this.appName, this.env, loggingEvent);
         if (logMessage instanceof RunLogMessage) {
             final String message = LogMessageUtil.getLogMessage(logMessage, loggingEvent);
             MessageAppenderFactory.pushRundataQueue(message);
diff --git a/plumelog-log4j/src/main/java/com/plumelog/log4j/util/LogMessageUtil.java b/plumelog-log4j/src/main/java/com/plumelog/log4j/util/LogMessageUtil.java
index 879c6632f9c5c3f8ca2ae47e85442cfaab017a86..6901167345b5e60a3a555db966e33e60cfcc9222 100644
--- a/plumelog-log4j/src/main/java/com/plumelog/log4j/util/LogMessageUtil.java
+++ b/plumelog-log4j/src/main/java/com/plumelog/log4j/util/LogMessageUtil.java
@@ -15,7 +15,6 @@ import org.apache.log4j.spi.LoggingEvent;
 import org.slf4j.helpers.FormattingTuple;
 import org.slf4j.helpers.MessageFormatter;
 
-import java.sql.Timestamp;
 import java.util.Date;
 import java.util.Map;
 
@@ -27,23 +26,23 @@ import java.util.Map;
  * @version 1.0.0
  */
 public class LogMessageUtil {
-
-    public static BaseLogMessage getLogMessage(String appName, LoggingEvent loggingEvent) {
+    
+    public static BaseLogMessage getLogMessage(String appName, String env, LoggingEvent loggingEvent) {
         TraceMessage traceMessage = LogMessageThreadLocal.logMessageThreadLocal.get();
         String formattedMessage = getMessage(loggingEvent);
         if (formattedMessage.startsWith(LogMessageConstant.TRACE_PRE)) {
             return TraceLogMessageFactory.getTraceLogMessage(
-                    traceMessage, appName, loggingEvent.getTimeStamp());
+                    traceMessage, appName, env, loggingEvent.getTimeStamp());
         }
         RunLogMessage logMessage =
-                TraceLogMessageFactory.getLogMessage(appName, formattedMessage, loggingEvent.getTimeStamp());
+                TraceLogMessageFactory.getLogMessage(appName, env, formattedMessage, loggingEvent.getTimeStamp());
         logMessage.setClassName(loggingEvent.getLoggerName());
 
-        LocationInfo locationInfo=loggingEvent.getLocationInformation();
-        String method=locationInfo.getMethodName();
-        String line=locationInfo.getLineNumber();
-        logMessage.setMethod(method+"("+locationInfo.getFileName()+":"+line+")");
-        logMessage.setDateTime(DateUtil.parseDateToStr(new Date(loggingEvent.getTimeStamp()),DateUtil.DATE_TIME_FORMAT_YYYY_MM_DD_HH_MI));
+        LocationInfo locationInfo = loggingEvent.getLocationInformation();
+        String method = locationInfo.getMethodName();
+        String line = locationInfo.getLineNumber();
+        logMessage.setMethod(method + "(" + locationInfo.getFileName() + ":" + line + ")");
+        logMessage.setDateTime(DateUtil.parseDateToStr(new Date(loggingEvent.getTimeStamp()), DateUtil.DATE_TIME_FORMAT_YYYY_MM_DD_HH_MI));
 
         logMessage.setLogLevel(loggingEvent.getLevel().toString());
         return logMessage;
@@ -55,10 +54,11 @@ public class LogMessageUtil {
      * @param logEvent
      * @return
      */
-    public static String getLogMessage(BaseLogMessage baseLogMessage,final LoggingEvent logEvent){
-        Map<String, String> mdc= logEvent.getProperties();
-        Map<String, Object> map= GfJsonUtil.parseObject(GfJsonUtil.toJSONString(baseLogMessage),Map.class);
-        if(mdc!=null) {
+    @SuppressWarnings("unchecked")
+    public static String getLogMessage(BaseLogMessage baseLogMessage, final LoggingEvent logEvent) {
+        Map<String, String> mdc = logEvent.getProperties();
+        Map<String, Object> map = GfJsonUtil.parseObject(GfJsonUtil.toJSONString(baseLogMessage), Map.class);
+        if (mdc != null) {
             map.putAll(mdc);
         }
         return GfJsonUtil.toJSONString(map);
@@ -66,11 +66,12 @@ public class LogMessageUtil {
     private static String getMessage(LoggingEvent logEvent) {
         if (logEvent.getLevel().toInt() == Priority.ERROR_INT) {
             String msg = "";
-            if (logEvent.getThrowableInformation() != null){
+            if (logEvent.getThrowableInformation() != null) {
                 msg = LogExceptionStackTrace.erroStackTrace(
                         logEvent.getThrowableInformation().getThrowable()).toString();
             }
-            if (logEvent.getRenderedMessage()!=null&&logEvent.getRenderedMessage().indexOf(LogMessageConstant.DELIM_STR) > -1) {
+            if (logEvent.getRenderedMessage() != null && logEvent.getRenderedMessage()
+                    .contains(LogMessageConstant.DELIM_STR)) {
                 FormattingTuple format = MessageFormatter.format(logEvent.getRenderedMessage(), msg);
                 return format.getMessage();
             }
diff --git a/plumelog-log4j2/src/main/java/com/plumelog/log4j2/appender/KafkaAppender.java b/plumelog-log4j2/src/main/java/com/plumelog/log4j2/appender/KafkaAppender.java
index 181a4a9aba28de417b9a24ad16aca9023116c229..709c624694d6bb2e79a67cb36e6ea3bce6aa1dfd 100644
--- a/plumelog-log4j2/src/main/java/com/plumelog/log4j2/appender/KafkaAppender.java
+++ b/plumelog-log4j2/src/main/java/com/plumelog/log4j2/appender/KafkaAppender.java
@@ -18,7 +18,6 @@ import org.apache.logging.log4j.core.config.plugins.PluginElement;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
 
 import java.io.Serializable;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 
 /**
@@ -32,6 +31,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class KafkaAppender extends AbstractAppender {
     private static KafkaProducerClient kafkaClient;
     private String appName;
+    private String env;
     private String kafkaHosts;
     private String runModel;
     private String expand;
@@ -39,10 +39,11 @@ public class KafkaAppender extends AbstractAppender {
     private int logQueueSize = 10000;
     private int threadPoolSize = 1;
 
-    protected KafkaAppender(String name, String appName, String kafkaHosts, String runModel, Filter filter, Layout<? extends Serializable> layout,
+    protected KafkaAppender(String name, String appName, String env, String kafkaHosts, String runModel, Filter filter, Layout<? extends Serializable> layout,
                             final boolean ignoreExceptions, String expand, int maxCount, int logQueueSize, int threadPoolSize) {
         super(name, filter, layout, ignoreExceptions);
         this.appName = appName;
+        this.env = env;
         this.kafkaHosts = kafkaHosts;
         this.runModel = runModel;
         this.expand = expand;
@@ -57,7 +58,7 @@ public class KafkaAppender extends AbstractAppender {
     }
 
     protected void send(LogEvent logEvent) {
-        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(appName, logEvent);
+        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(appName, env, logEvent);
         if (logMessage instanceof RunLogMessage) {
             final String message = LogMessageUtil.getLogMessage(logMessage, logEvent);
             MessageAppenderFactory.pushRundataQueue(message);
@@ -73,6 +74,7 @@ public class KafkaAppender extends AbstractAppender {
     public static KafkaAppender createAppender(
             @PluginAttribute("name") String name,
             @PluginAttribute("appName") String appName,
+            @PluginAttribute("env") String env,
             @PluginAttribute("kafkaHosts") String kafkaHosts,
             @PluginAttribute("topic") String topic,
             @PluginAttribute("expand") String expand,
@@ -83,6 +85,9 @@ public class KafkaAppender extends AbstractAppender {
             @PluginAttribute("compressor") boolean compressor,
             @PluginElement("Layout") Layout<? extends Serializable> layout,
             @PluginElement("Filter") final Filter filter) {
+        if (env == null) {
+            env = "default";
+        }
         if (runModel != null) {
             LogMessageConstant.RUN_MODEL = Integer.parseInt(runModel);
         }
@@ -112,6 +117,6 @@ public class KafkaAppender extends AbstractAppender {
                 MessageAppenderFactory.startTraceLog(kafkaClient, count);
             });
         }
-        return new KafkaAppender(name, appName, kafkaHosts, runModel, filter, layout, true, expand, maxCount, logQueueSize, threadPoolSize);
+        return new KafkaAppender(name, appName, env, kafkaHosts, runModel, filter, layout, true, expand, maxCount, logQueueSize, threadPoolSize);
     }
 }
diff --git a/plumelog-log4j2/src/main/java/com/plumelog/log4j2/appender/RedisAppender.java b/plumelog-log4j2/src/main/java/com/plumelog/log4j2/appender/RedisAppender.java
index 8125d44acb9ac185b0585f9e3dfe2e68e9ee5f24..7cb738cacc90d8fb5b6bfcbeb0b16a70bdaefcaa 100644
--- a/plumelog-log4j2/src/main/java/com/plumelog/log4j2/appender/RedisAppender.java
+++ b/plumelog-log4j2/src/main/java/com/plumelog/log4j2/appender/RedisAppender.java
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.core.config.plugins.PluginElement;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
 
 import java.io.Serializable;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 
 /**
@@ -35,6 +34,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class RedisAppender extends AbstractAppender {
     private static AbstractClient redisClient;
     private String appName;
+    private String env;
     private String redisHost;
     private String redisPort;
     private String redisAuth;
@@ -48,10 +48,11 @@ public class RedisAppender extends AbstractAppender {
     private String model = "standalone";
     private String masterName;
 
-    protected RedisAppender(String name, String appName, String redisHost, String redisPort, String redisAuth, String runModel, Filter filter, Layout<? extends Serializable> layout,
+    protected RedisAppender(String name, String appName, String env, String redisHost, String redisPort, String redisAuth, String runModel, Filter filter, Layout<? extends Serializable> layout,
                             final boolean ignoreExceptions, String expand, int maxCount, int logQueueSize, int redisDb, int threadPoolSize, boolean compressor, String model, String masterName) {
         super(name, filter, layout, ignoreExceptions);
         this.appName = appName;
+        this.env = env;
         this.redisHost = redisHost;
         this.redisPort = redisPort;
         this.redisAuth = redisAuth;
@@ -72,7 +73,7 @@ public class RedisAppender extends AbstractAppender {
     }
 
     protected void send(LogEvent logEvent) {
-        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(appName, logEvent);
+        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(appName, env, logEvent);
         if (logMessage instanceof RunLogMessage) {
             final String message = LogMessageUtil.getLogMessage(logMessage, logEvent);
             MessageAppenderFactory.pushRundataQueue(message);
@@ -88,6 +89,7 @@ public class RedisAppender extends AbstractAppender {
     public static RedisAppender createAppender(
             @PluginAttribute("name") String name,
             @PluginAttribute("appName") String appName,
+            @PluginAttribute("env") String env,
             @PluginAttribute("redisHost") String redisHost,
             @PluginAttribute("redisPort") String redisPort,
             @PluginAttribute("redisAuth") String redisAuth,
@@ -102,6 +104,9 @@ public class RedisAppender extends AbstractAppender {
             @PluginAttribute("masterName") String masterName,
             @PluginElement("Layout") Layout<? extends Serializable> layout,
             @PluginElement("Filter") final Filter filter) {
+        if (env == null) {
+            env = "default";
+        }
         if (runModel != null) {
             LogMessageConstant.RUN_MODEL = Integer.parseInt(runModel);
         }
@@ -124,7 +129,7 @@ public class RedisAppender extends AbstractAppender {
                     String[] hs = redisHost.split(":");
                     if (hs.length == 2) {
                         ip = hs[0];
-                        port = Integer.valueOf(hs[1]);
+                        port = Integer.parseInt(hs[1]);
                     }
                 } else {
                     ip = redisHost;
@@ -156,6 +161,6 @@ public class RedisAppender extends AbstractAppender {
                         compressor ? LogMessageConstant.LOG_KEY_TRACE_COMPRESS : LogMessageConstant.LOG_KEY_TRACE, compressor);
             });
         }
-        return new RedisAppender(name, appName, redisHost, redisPort, redisAuth, runModel, filter, layout, true, expand, maxCount, logQueueSize, redisDb, threadPoolSize, compressor, model, masterName);
+        return new RedisAppender(name, appName, env, redisHost, redisPort, redisAuth, runModel, filter, layout, true, expand, maxCount, logQueueSize, redisDb, threadPoolSize, compressor, model, masterName);
     }
 }
diff --git a/plumelog-log4j2/src/main/java/com/plumelog/log4j2/util/LogMessageUtil.java b/plumelog-log4j2/src/main/java/com/plumelog/log4j2/util/LogMessageUtil.java
index c3cf8c4cba5cf09bf6a82b5bbbd3d46135c317b1..b3150c17db8481a103ec805db65e60a1aa0ef60a 100644
--- a/plumelog-log4j2/src/main/java/com/plumelog/log4j2/util/LogMessageUtil.java
+++ b/plumelog-log4j2/src/main/java/com/plumelog/log4j2/util/LogMessageUtil.java
@@ -31,10 +31,10 @@ public class LogMessageUtil {
 
     private static String isExpandRunLog(LogEvent logEvent) {
         String traceId = null;
-            if (!logEvent.getContextData().isEmpty()) {
-                traceId = logEvent.getContextData().toMap().get(LogMessageConstant.TRACE_ID);
-                TraceId.logTraceID.set(traceId);
-            }
+        if (!logEvent.getContextData().isEmpty()) {
+            traceId = logEvent.getContextData().toMap().get(LogMessageConstant.TRACE_ID);
+            TraceId.logTraceID.set(traceId);
+        }
         return traceId;
     }
 
@@ -45,6 +45,7 @@ public class LogMessageUtil {
      * @param logEvent
      * @return
      */
+    @SuppressWarnings("unchecked")
     public static String getLogMessage(BaseLogMessage baseLogMessage, final LogEvent logEvent) {
         Map<String, String> mdc = logEvent.getContextData().toMap();
         Map<String, Object> map = GfJsonUtil.parseObject(GfJsonUtil.toJSONString(baseLogMessage), Map.class);
@@ -55,16 +56,16 @@ public class LogMessageUtil {
         return GfJsonUtil.toJSONString(map);
     }
 
-    public static BaseLogMessage getLogMessage(String appName, LogEvent logEvent) {
+    public static BaseLogMessage getLogMessage(String appName, String env, LogEvent logEvent) {
         isExpandRunLog(logEvent);
         TraceMessage traceMessage = LogMessageThreadLocal.logMessageThreadLocal.get();
         String formattedMessage = getMessage(logEvent);
         if (formattedMessage.startsWith(LogMessageConstant.TRACE_PRE)) {
             return TraceLogMessageFactory.getTraceLogMessage(
-                    traceMessage, appName, logEvent.getTimeMillis());
+                    traceMessage, appName, env, logEvent.getTimeMillis());
         }
         RunLogMessage logMessage =
-                TraceLogMessageFactory.getLogMessage(appName, formattedMessage, logEvent.getTimeMillis());
+                TraceLogMessageFactory.getLogMessage(appName, env, formattedMessage, logEvent.getTimeMillis());
         logMessage.setClassName(logEvent.getLoggerName());
 
         StackTraceElement stackTraceElement = logEvent.getSource();
diff --git a/plumelog-logback/src/main/java/com/plumelog/logback/appender/KafkaAppender.java b/plumelog-logback/src/main/java/com/plumelog/logback/appender/KafkaAppender.java
index bd75050cce57ce32e8c5ea6fc0642ce420f2198b..0223d2103a13228f7906debc131d48012beee117 100644
--- a/plumelog-logback/src/main/java/com/plumelog/logback/appender/KafkaAppender.java
+++ b/plumelog-logback/src/main/java/com/plumelog/logback/appender/KafkaAppender.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class KafkaAppender extends AppenderBase<ILoggingEvent> {
     private KafkaProducerClient kafkaClient;
     private String appName;
+    private String env = "default";
     private String kafkaHosts;
     private String runModel;
     private String expand;
@@ -43,7 +44,11 @@ public class KafkaAppender extends AppenderBase<ILoggingEvent> {
     public void setAppName(String appName) {
         this.appName = appName;
     }
-
+    
+    public void setEnv(String env) {
+        this.env = env;
+    }
+    
     public void setKafkaHosts(String kafkaHosts) {
         this.kafkaHosts = kafkaHosts;
     }
@@ -73,7 +78,7 @@ public class KafkaAppender extends AppenderBase<ILoggingEvent> {
         send(event);
     }
     protected void send(ILoggingEvent event) {
-        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(appName, event);
+        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(appName, env, event);
         if (logMessage instanceof RunLogMessage) {
             final String message = LogMessageUtil.getLogMessage(logMessage, event);
             MessageAppenderFactory.pushRundataQueue(message);
diff --git a/plumelog-logback/src/main/java/com/plumelog/logback/appender/RedisAppender.java b/plumelog-logback/src/main/java/com/plumelog/logback/appender/RedisAppender.java
index cff13adb2c28a3add7fb31ece9e953aeb36672d7..9c5ad69de312170ee49726730916534ea4ae76b5 100644
--- a/plumelog-logback/src/main/java/com/plumelog/logback/appender/RedisAppender.java
+++ b/plumelog-logback/src/main/java/com/plumelog/logback/appender/RedisAppender.java
@@ -14,7 +14,6 @@ import com.plumelog.core.util.GfJsonUtil;
 import com.plumelog.core.util.ThreadPoolUtil;
 import com.plumelog.logback.util.LogMessageUtil;
 
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 
 /**
@@ -28,6 +27,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class RedisAppender extends AppenderBase<ILoggingEvent> {
     private AbstractClient redisClient;
     private String appName;
+    private String env = "default";
     private String redisHost;
     private String redisPort;
     private String redisAuth;
@@ -52,7 +52,11 @@ public class RedisAppender extends AppenderBase<ILoggingEvent> {
     public void setAppName(String appName) {
         this.appName = appName;
     }
-
+    
+    public void setEnv(String env) {
+        this.env = env;
+    }
+    
     public void setRedisHost(String redisHost) {
         this.redisHost = redisHost;
     }
@@ -111,7 +115,7 @@ public class RedisAppender extends AppenderBase<ILoggingEvent> {
     }
 
     protected void send(ILoggingEvent event) {
-        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(appName, event);
+        final BaseLogMessage logMessage = LogMessageUtil.getLogMessage(appName, env, event);
         if (logMessage instanceof RunLogMessage) {
             final String message = LogMessageUtil.getLogMessage(logMessage, event);
             MessageAppenderFactory.pushRundataQueue(message);
@@ -133,18 +137,23 @@ public class RedisAppender extends AppenderBase<ILoggingEvent> {
         }
         if (this.redisClient == null) {
 
-            if (this.model.equals("cluster")) {
+            if ("cluster".equals(this.model)) {
                 this.redisClient = RedisClusterClient.getInstance(this.redisHost, this.redisAuth);
-            } else if (this.model.equals("sentinel")) {
+            } else if ("sentinel".equals(this.model)) {
                 this.redisClient = RedisSentinelClient.getInstance(this.redisHost, this.masterName, this.redisAuth, this.redisDb);
             } else {
                 int port = 6379;
                 String ip = "127.0.0.1";
                 if (this.redisPort == null) {
-                    String[] hs = redisHost.split(":");
-                    if (hs.length == 2) {
-                        ip = hs[0];
-                        port = Integer.valueOf(hs[1]);
+                    // 如果redisHost不包含:号则端口号默认使用6379
+                    if (redisHost.contains(":")) {
+                        String[] hs = redisHost.split(":");
+                        if (hs.length == 2) {
+                            ip = hs[0];
+                            port = Integer.parseInt(hs[1]);
+                        }
+                    } else {
+                        ip = this.redisHost;
                     }
                 } else {
                     ip = this.redisHost;
diff --git a/plumelog-logback/src/main/java/com/plumelog/logback/util/LogMessageUtil.java b/plumelog-logback/src/main/java/com/plumelog/logback/util/LogMessageUtil.java
index 5b3099a233f587301fcac9c531793531e77671fa..f0a7fbfbd4a49abed4b6df0251eeded2e351a27a 100644
--- a/plumelog-logback/src/main/java/com/plumelog/logback/util/LogMessageUtil.java
+++ b/plumelog-logback/src/main/java/com/plumelog/logback/util/LogMessageUtil.java
@@ -27,10 +27,10 @@ public class LogMessageUtil {
 
     private static String isExpandRunLog(ILoggingEvent logEvent) {
         String traceId = null;
-            if (!logEvent.getMDCPropertyMap().isEmpty()) {
-                traceId = logEvent.getMDCPropertyMap().get(LogMessageConstant.TRACE_ID);
-                TraceId.logTraceID.set(traceId);
-            }
+        if (!logEvent.getMDCPropertyMap().isEmpty()) {
+            traceId = logEvent.getMDCPropertyMap().get(LogMessageConstant.TRACE_ID);
+            TraceId.logTraceID.set(traceId);
+        }
         return traceId;
     }
 
@@ -41,6 +41,7 @@ public class LogMessageUtil {
      * @param iLoggingEvent
      * @return
      */
+    @SuppressWarnings("unchecked")
     public static String getLogMessage(BaseLogMessage baseLogMessage, final ILoggingEvent iLoggingEvent) {
         Map<String, String> mdc = iLoggingEvent.getMDCPropertyMap();
         Map<String, Object> map = GfJsonUtil.parseObject(GfJsonUtil.toJSONString(baseLogMessage), Map.class);
@@ -50,16 +51,16 @@ public class LogMessageUtil {
         return GfJsonUtil.toJSONString(map);
     }
 
-    public static BaseLogMessage getLogMessage(final String appName, final ILoggingEvent iLoggingEvent) {
+    public static BaseLogMessage getLogMessage(final String appName, final String env, final ILoggingEvent iLoggingEvent) {
         isExpandRunLog(iLoggingEvent);
         TraceMessage traceMessage = LogMessageThreadLocal.logMessageThreadLocal.get();
         String formattedMessage = getMessage(iLoggingEvent);
         if (formattedMessage.startsWith(LogMessageConstant.TRACE_PRE)) {
             return TraceLogMessageFactory.getTraceLogMessage(
-                    traceMessage, appName, iLoggingEvent.getTimeStamp());
+                    traceMessage, appName, env, iLoggingEvent.getTimeStamp());
         }
         RunLogMessage logMessage =
-                TraceLogMessageFactory.getLogMessage(appName, formattedMessage, iLoggingEvent.getTimeStamp());
+                TraceLogMessageFactory.getLogMessage(appName, env, formattedMessage, iLoggingEvent.getTimeStamp());
         logMessage.setClassName(iLoggingEvent.getLoggerName());
 
         StackTraceElement stackTraceElement = iLoggingEvent.getCallerData()[0];
@@ -94,7 +95,7 @@ public class LogMessageUtil {
     }
 
     private static String packageMessage(String message, Object[] args) {
-        if (message != null && message.indexOf(LogMessageConstant.DELIM_STR) > -1) {
+        if (message != null && message.contains(LogMessageConstant.DELIM_STR)) {
             return MessageFormatter.arrayFormat(message, args).getMessage();
         }
         return TraceLogMessageFactory.packageMessage(message, args);
diff --git a/plumelog-server/src/main/java/com/plumelog/server/cache/AppNameCache.java b/plumelog-server/src/main/java/com/plumelog/server/cache/AppNameCache.java
index 8f4916a6aecc99b2e7456528ea4c6138833cbcc4..01d26f2e95bc5a971c2bbce37bfd31191c77fd95 100644
--- a/plumelog-server/src/main/java/com/plumelog/server/cache/AppNameCache.java
+++ b/plumelog-server/src/main/java/com/plumelog/server/cache/AppNameCache.java
@@ -1,9 +1,12 @@
 package com.plumelog.server.cache;
 
-import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class AppNameCache {
+    
     public static final String APP_NAME_SET = "plumelog:appname:set";
-    public static Set<String> appName=new HashSet<>();
+    
+    public static Map<String, Set<String>> appName = new ConcurrentHashMap<>();
 }
diff --git a/plumelog-server/src/main/java/com/plumelog/server/client/ElasticLowerClient.java b/plumelog-server/src/main/java/com/plumelog/server/client/ElasticLowerClient.java
index bc02a02632224a81c80f0e37333f58e780391009..0f6fb96636c0d51dd9e8ce65059cd05b484db929 100644
--- a/plumelog-server/src/main/java/com/plumelog/server/client/ElasticLowerClient.java
+++ b/plumelog-server/src/main/java/com/plumelog/server/client/ElasticLowerClient.java
@@ -141,12 +141,13 @@ public class ElasticLowerClient {
     }
 
     public boolean creatIndice(String indice,String type) {
-        List<String> existIndexList = new ArrayList<String>();
         try {
             Request request = new Request(
                     "PUT",
                     "/" + indice + "");
             String properties = "\"properties\":{\"appName\":{\"type\":\"keyword\"}," +
+                    "\"env\":{\"type\":\"keyword\"}," +
+                    "\"appNameWithEnv\":{\"type\":\"keyword\"}," +
                     "\"logLevel\":{\"type\":\"keyword\"}," +
                     "\"serverName\":{\"type\":\"keyword\"}," +
                     "\"traceId\":{\"type\":\"keyword\"}," +
@@ -171,12 +172,13 @@ public class ElasticLowerClient {
         return false;
     }
     public boolean creatIndiceTrace(String indice, String type) {
-        List<String> existIndexList = new ArrayList<String>();
         try {
             Request request = new Request(
                     "PUT",
                     "/" + indice + "");
             String properties = "\"properties\":{\"appName\":{\"type\":\"keyword\"}," +
+                    "\"env\":{\"type\":\"keyword\"}" +
+                    "\"appNameWithEnv\":{\"type\":\"keyword\"}" +
                     "\"traceId\":{\"type\":\"keyword\"}" +
                     "}";
             String ent = "{\"settings\":{\"number_of_shards\":"+ InitConfig.ES_INDEX_SHARDS+",\"number_of_replicas\":"+InitConfig.ES_INDEX_REPLICAS+",\"refresh_interval\":\""+InitConfig.ES_REFRESH_INTERVAL+"\"}";
diff --git a/plumelog-server/src/main/java/com/plumelog/server/collect/BaseLogCollect.java b/plumelog-server/src/main/java/com/plumelog/server/collect/BaseLogCollect.java
index 6226eae3b2df23ec8bcbafb0185881d31bb58c8f..0e6fd76d5d3a93b07eb6922047675214f83f2b48 100644
--- a/plumelog-server/src/main/java/com/plumelog/server/collect/BaseLogCollect.java
+++ b/plumelog-server/src/main/java/com/plumelog/server/collect/BaseLogCollect.java
@@ -14,6 +14,7 @@ import org.springframework.context.ApplicationEventPublisher;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -75,7 +76,7 @@ public class BaseLogCollect {
                 for(int i=0;i<size;i++) {
                     String logString = logs.get(i);
                     RunLogMessage runLogMessage = JSON.parseObject(logString, RunLogMessage.class);
-                    AppNameCache.appName.add(runLogMessage.getAppName());
+                    AppNameCache.appName.computeIfAbsent(runLogMessage.getAppName(), k -> new HashSet<>()).add(runLogMessage.getEnv());
                     if (runLogMessage.getLogLevel().toUpperCase().equals("ERROR")) {
                         errorLogs.add(runLogMessage);
                     }
diff --git a/plumelog-server/src/main/java/com/plumelog/server/controller/MainController.java b/plumelog-server/src/main/java/com/plumelog/server/controller/MainController.java
index ed586045d830acc9b5e2f5fc8d83010206827ca2..c9157cfb982052f4a8ef87c121efa838b3b11f02 100644
--- a/plumelog-server/src/main/java/com/plumelog/server/controller/MainController.java
+++ b/plumelog-server/src/main/java/com/plumelog/server/controller/MainController.java
@@ -269,6 +269,7 @@ public class MainController {
             WarningRuleDto warningRuleDto=new WarningRuleDto();
             warningRuleDto.setId(mapKey);
             warningRuleDto.setAppName(warningRule.getAppName());
+            warningRuleDto.setEnv(warningRule.getEnv());
             warningRuleDto.setAppCategory(warningRule.getAppCategory());
             warningRuleDto.setClassName(warningRule.getClassName());
             warningRuleDto.setReceiver(warningRule.getReceiver());
diff --git a/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorListener.java b/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorListener.java
index 73291d363614fbdd5e0f49680bf0037c8b15b265..a12dd9f9000b4cbde273fb0d20af09ae3f77671b 100644
--- a/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorListener.java
+++ b/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorListener.java
@@ -75,7 +75,7 @@ public class PlumeLogMonitorListener implements ApplicationListener<PlumelogMoni
      */
     public void parserLogMessage(List<RunLogMessage> logMessages) {
         logMessages.forEach(runLogMessage -> {
-            List<WarningRule> monitorRuleConfig = plumeLogMonitorRuleConfig.getMonitorRuleConfig(runLogMessage.getAppName());
+            List<WarningRule> monitorRuleConfig = plumeLogMonitorRuleConfig.getMonitorRuleConfig(runLogMessage.getAppName(), runLogMessage.getEnv());
             if (monitorRuleConfig != null) {
                 //运行规则
                 enforcementRules(monitorRuleConfig, runLogMessage);
@@ -95,6 +95,7 @@ public class PlumeLogMonitorListener implements ApplicationListener<PlumelogMoni
             WarningRule warningRule = rules.get(i);
             String className = warningRule.getClassName();
             String appName = warningRule.getAppName();
+            String env = warningRule.getEnv();
             if (containsClassName(className, runLogMessage.getClassName())) {
                 continue;
             }
@@ -102,7 +103,7 @@ public class PlumeLogMonitorListener implements ApplicationListener<PlumelogMoni
             String cn = StringUtils.isEmpty(className) ? "" : runLogMessage.getClassName();
 
             //统计分析
-            statisticAlnalysis(getKey(appName, className), warningRule, errorContent, cn);
+            statisticAlnalysis(getKey(appName, env, className), warningRule, errorContent, cn);
         }
     }
 
@@ -171,8 +172,8 @@ public class PlumeLogMonitorListener implements ApplicationListener<PlumelogMoni
      * @param className 类名
      * @return
      */
-    private static String getKey(String appName, String className) {
-        String key = LogMessageConstant.PLUMELOG_MONITOR_KEY + appName;
+    private static String getKey(String appName, String env, String className) {
+        String key = LogMessageConstant.PLUMELOG_MONITOR_KEY + appName + ":" + env;
         if (!StringUtils.isEmpty(className)) {
             key = key + ":" + className;
         }
@@ -188,7 +189,7 @@ public class PlumeLogMonitorListener implements ApplicationListener<PlumelogMoni
      */
     private void earlyWarning(WarningRule rule, long count, String key, String errorContent, String className) {
         PlumeLogMonitorTextMessage plumeLogMonitorTextMessage =
-                new PlumeLogMonitorTextMessage.Builder(rule.getAppName())
+                new PlumeLogMonitorTextMessage.Builder(rule.getAppName(), rule.getEnv())
                         .className(rule.getClassName())
                         .errorCount(rule.getErrorCount())
                         .time(rule.getTime())
@@ -244,6 +245,7 @@ public class PlumeLogMonitorListener implements ApplicationListener<PlumelogMoni
         long startTime = currentTime - time;
         StringBuilder builder = new StringBuilder(64);
         builder.append(url).append("/#/?appName=").append(rule.getAppName())
+                .append("&env=").append(rule.getEnv())
                 .append("&className=").append(className)
                 .append("&logLevel=ERROR")
                 .append("&time=").append(startTime).append(",").append(currentTime);
diff --git a/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorRuleConfig.java b/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorRuleConfig.java
index 57313956e3b32ca35e0e6cdf83a633302193a687..5cff6e662cd4a67e21c79fd905a6a98b7979e7f7 100644
--- a/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorRuleConfig.java
+++ b/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorRuleConfig.java
@@ -4,11 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.plumelog.core.AbstractClient;
 import com.plumelog.core.constant.LogMessageConstant;
 import com.plumelog.core.dto.WarningRule;
-import com.plumelog.core.redis.RedisClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -39,11 +37,11 @@ public class PlumeLogMonitorRuleConfig {
      * @param appName
      * @return
      */
-    public List<WarningRule> getMonitorRuleConfig(String appName) {
+    public List<WarningRule> getMonitorRuleConfig(String appName, String env) {
         if (configMap.isEmpty()) {
             initMonitorRuleConfig();
         }
-        return configMap.get(appName);
+        return configMap.get(getKey(appName, env));
     }
 
     public synchronized void initMonitorRuleConfig() {
@@ -62,14 +60,15 @@ public class PlumeLogMonitorRuleConfig {
         if (warningRule.getStatus() == 0) {
             return;
         }
-        if (backConfigMap.containsKey(warningRule.getAppName())) {
-            List<WarningRule> warningRules = backConfigMap.get(warningRule.getAppName());
+        String key = getKey(warningRule.getAppName(), warningRule.getEnv());
+        if (backConfigMap.containsKey(key)) {
+            List<WarningRule> warningRules = backConfigMap.get(key);
             warningRules.add(warningRule);
-            backConfigMap.put(warningRule.getAppName(), warningRules);
+            backConfigMap.put(key, warningRules);
         } else {
             List<WarningRule> lists = new ArrayList<>();
             lists.add(warningRule);
-            backConfigMap.put(warningRule.getAppName(), lists);
+            backConfigMap.put(key, lists);
         }
     }
 
@@ -84,4 +83,8 @@ public class PlumeLogMonitorRuleConfig {
 
         }
     }
+    
+    private static String getKey(String appName, String env) {
+        return appName + ":" + env;
+    }
 }
diff --git a/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorTextMessage.java b/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorTextMessage.java
index 6c3fee13fab7149b156898f9d89c3214c0622be6..b915f31fcee092fb5bc39b33e820e68dbcb0dc8b 100644
--- a/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorTextMessage.java
+++ b/plumelog-server/src/main/java/com/plumelog/server/monitor/PlumeLogMonitorTextMessage.java
@@ -52,6 +52,8 @@ public class PlumeLogMonitorTextMessage {
         private Long time;
 
         private String appName;
+        
+        private String env;
 
         private String className;
 
@@ -59,8 +61,9 @@ public class PlumeLogMonitorTextMessage {
 
         private String errorContent;
 
-        public Builder(String appName) {
+        public Builder(String appName, String env) {
             this.appName = appName;
+            this.env = env;
         }
 
         public Builder className(String className) {
@@ -98,7 +101,9 @@ public class PlumeLogMonitorTextMessage {
         public String toString() {
 
             StringBuilder builder = new StringBuilder();
-            builder.append("#### 报警通知：").append(" \n> ").append("应用名 【").append(appName).append("】\n\n>");
+            builder.append("#### 报警通知：").append(" \n> ")
+                    .append("应用名 【").append(appName).append("】\n\n>")
+                    .append("应用环境【").append(env).append("】\n\n> ");
             if (!StringUtils.isEmpty(className)) {
                 builder.append("类路径【").append(className).append("】 \n\n> ");
             }
diff --git a/plumelog-ui-front/src/assets/less/filters.less b/plumelog-ui-front/src/assets/less/filters.less
index 7ea5a8dc1bcc749646d05a3200fa07eefd82192c..d557554aa8ebbe0a9f1f40e253e1372f6b7e706f 100644
--- a/plumelog-ui-front/src/assets/less/filters.less
+++ b/plumelog-ui-front/src/assets/less/filters.less
@@ -7,16 +7,16 @@
         text-align:left;
         padding-bottom:10px;
         &.key{
-          padding-left:20px;
+          padding-left:15px;
           text-align:right;
           font-weight:700;
-          width:150px;
-          padding-right:30px;
+          width:110px;
+          padding-right:20px;
         }
         .txt{
           &.txtAppName
           {
-            width:220px;
+            width:200px;
           }
         }
         .ivu-checkbox-default
diff --git a/plumelog-ui-front/src/components/table-expand.vue b/plumelog-ui-front/src/components/table-expand.vue
index a83daa686b5751b3b8713299533af0479a6dd867..e5cf8680d3aac7cf1de66fcaa6bb46fd489c801a 100644
--- a/plumelog-ui-front/src/components/table-expand.vue
+++ b/plumelog-ui-front/src/components/table-expand.vue
@@ -46,10 +46,10 @@ export default {
   },
   methods: {
     hightLightCode(code, isHighlight) {
-      code = code.replace(/\\n\\t/g, "\n").replace(/\\n\\tat/g, "\n").replace(/\\n/g, '\n');
+      code = code.replace(/\\n/g, '\n').replace(/\\t/g, '\t');
       let rows = [];
       if (code.indexOf('java.') > -1) {
-        let content = '<pre style="word-break:break-all;white-space: normal;">' + Prism.highlight(code.replace(/\n/g, '<br/>'), Prism.languages.stackjava, 'stackjava').replace(/&lt;/g, '<').replace(/&gt;/g, '>') + "</pre>"
+        let content = '<pre style="word-break:break-all;white-space: normal;">' + Prism.highlight(code.replace(/\n/g, '<br/>').replace(/\t/g, '　　'), Prism.languages.stackjava, 'stackjava').replace(/&lt;/g, '<').replace(/&gt;/g, '>') + "</pre>"
         rows.push({isH: true, content})
         return rows;
       }else if (isHtml.test(code)) {
@@ -78,7 +78,7 @@ export default {
         rows.push({isH: false, content})
         return rows;
       } else {
-        let content = '<div style="word-break:break-all;white-space: normal;">' + code.replace(/\n/g, '<br/>').replace(/\tat/g, '') + "</div>";
+        let content = '<div style="word-break:break-all;white-space: normal;">' + code.replace(/\n/g, '<br/>').replace(/\t/g, '　　') + "</div>";
         rows.push({isH: true, content})
         return rows;
       }
diff --git a/plumelog-ui-front/src/views/Home.vue b/plumelog-ui-front/src/views/Home.vue
index 13867f6928d36a9d9cb9abfa3e731979fa3fb1fc..2279a247e235cc030c6ee9ba7a9a8055b36b9379 100644
--- a/plumelog-ui-front/src/views/Home.vue
+++ b/plumelog-ui-front/src/views/Home.vue
@@ -12,67 +12,152 @@
         <log-header></log-header>
 
         <!--查询条件-->
-        <table class='tbl_filters'>
-          <tbody>
-          <tr>
-            <td class="key">应用名称</td>
-            <td>
-              <AutoComplete
-                  v-model="filter.appName"
-                  :data="appNameComplete"
-                  class="txt txtAppName"
-                  placeholder="搜索多个请用逗号或空格隔开"
-                  :clearable="true"
-                  :filter-method="completeFilter"
-                  @on-change="appNameChange">
-              </AutoComplete>
-              <Checkbox v-model="isExclude">排除</Checkbox>
-            </td>
-          </tr>
-          <tr>
-            <td class="key">日志等级</td>
-            <td>
-              <Select v-model="filter.logLevel"  placeholder="请选择日志等级">
-                <Option value="" key="ALL">所有</Option>
-                <Option value="INFO" key="INFO">INFO</Option>
-                <Option value="ERROR" key="ERROR">ERROR</Option>
-                <Option value="WARN" key="WARN">WARN</Option>
-                <Option value="DEBUG" key="DEBUG">DEBUG</Option>
-              </Select>
-            </td>
-          </tr>
-          <tr>
-            <td class="key">服务器名称</td>
-            <td>
-              <Input class="txt" name="serverName" v-model="filter.serverName" placeholder="搜索多个请用逗号或空格隔开"
-                     :clearable="true"/>
-            </td>
-          </tr>
-          </tbody>
-        </table>
-        <table class='tbl_filters'>
-          <tr>
-            <td class="key">类名</td>
-            <td>
-              <Input class="txt" name="className" v-model="filter.className" placeholder="搜索多个请用逗号或空格隔开"
-                     :clearable="true"/>
-            </td>
-          </tr>
-          <tr>
-            <td class="key">追踪码</td>
-            <td>
-              <Input class="txt" name="traceId" v-model="filter.traceId" placeholder="搜索多个请用逗号或空格隔开" :clearable="true"/>
-            </td>
-          </tr>
-          <tr>
-            <td class="key">日期和时间</td>
-            <td>
-              <DatePicker ref='datePicker' v-model="dateTimeRange" @on-change="dateChange" type="datetimerange"
-                          :options="dateOption" format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期与时间"
-                          style="width: 315px"></DatePicker>
-            </td>
-          </tr>
-        </table>
+        <div style="width: 1000px; padding: 0 10px 0 30px">
+          <table class='tbl_filters' style="width: 100%">
+            <tbody>
+            <tr>
+              <td class="key">应用名称</td>
+              <td>
+                <AutoComplete
+                    v-model="filter.appName"
+                    :data="appNameComplete"
+                    class="txt txtAppName"
+                    placeholder="搜索多个请用逗号或空格隔开"
+                    :clearable="true"
+                    :filter-method="completeFilter"
+                    @on-change="appNameChange">
+                </AutoComplete>
+                <Checkbox v-model="isExclude">排除</Checkbox>
+              </td>
+              <td class="key">应用环境</td>
+              <td>
+                <AutoComplete
+                    v-model="filter.env"
+                    :data="envComplete"
+                    class="txt txtAppName"
+                    placeholder="搜索多个请用逗号或空格隔开"
+                    :clearable="true"
+                    :filter-method="completeFilter"
+                    @on-change="envChange">
+                </AutoComplete>
+              </td>
+              <td class="key">日志等级</td>
+              <td style="width: 150px">
+                <Select v-model="filter.logLevel"  placeholder="请选择日志等级">
+                  <Option value="" key="ALL">所有</Option>
+                  <Option value="INFO" key="INFO">INFO</Option>
+                  <Option value="ERROR" key="ERROR">ERROR</Option>
+                  <Option value="WARN" key="WARN">WARN</Option>
+                  <Option value="DEBUG" key="DEBUG">DEBUG</Option>
+                </Select>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          
+          <table class='tbl_filters' style="width: 50%">
+            <tbody>
+            <tr>
+              <td class="key">追踪码</td>
+              <td>
+                <Input class="txt" name="traceId" v-model="filter.traceId" placeholder="搜索多个请用逗号或空格隔开" :clearable="true"/>
+              </td>
+            </tr>
+            <tr>
+              <td class="key">类名</td>
+              <td>
+                <Input class="txt" name="className" v-model="filter.className" placeholder="搜索多个请用逗号或空格隔开"
+                       :clearable="true"/>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          <table class='tbl_filters' style="float: right">
+            <tbody>
+            <tr>
+              <td class="key">服务器名称</td>
+              <td>
+                <Input class="txt" name="serverName" v-model="filter.serverName" placeholder="搜索多个请用逗号或空格隔开"
+                       :clearable="true"/>
+              </td>
+            </tr>
+            <tr>
+              <td class="key">日期和时间</td>
+              <td>
+                <DatePicker ref='datePicker' v-model="dateTimeRange" @on-change="dateChange" type="datetimerange"
+                            :options="dateOption" format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期与时间"
+                            style="width: 315px"></DatePicker>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+  
+          <div style="clear:both"></div>
+          <table class="tbl_filters" style="width:900px">
+            <tr v-if="extendList.length>0">
+              <td class="key">扩展字段</td>
+              <td>
+                <Select v-model="select_extend" @on-change="selectExtendHandler" label-in-value placeholder="选择扩展字段" style="width:150px;margin-right:10px">
+                  <Option v-for="extend in extendList" :value="extend.field" :key="extend.field">{{
+                    extend.fieldName
+                    }}
+                  </Option>
+                </Select>
+                <Input class="txt" @on-enter="addExtendTag" :clearable="true" v-model="extendTag" placeholder="输入查询内容"
+                       style="width:478px;"/>
+                <Button icon="md-add" @click="addExtendTag" style="margin-left:10px;width:100px">添加</Button>
+              </td>
+            </tr>
+            <tr v-if="extendOptions.length>0">
+              <td></td>
+              <td>
+                <Tag closable v-for="(tag,index) in extendOptions" size="medium" @on-close="closeExtendTag(index)"
+                     :key="index">
+                  <template v-if="index>0">{{ tag.type }}&nbsp;</template>
+                  {{ tag.label }}:{{ tag.tag }}
+                </Tag>
+              </td>
+            </tr>
+            <tr v-if="!useSearchQuery">
+              <td class="key">内容</td>
+              <td>
+                <Input class="txt" @on-enter="doSearch()" :clearable="true" style="width:638px" placeholder="输入搜索内容"
+                       v-model="searchKey"/>
+                <a href="javascript:void(0)" @click="useSearchQuery=true" class="link_changeModal">切换为条件模式</a>
+              </td>
+            </tr>
+            <tr v-if="useSearchQuery">
+              <td class="key">条件</td>
+              <td>
+                <Select v-if="searchOptions.length>0" v-model="selectOption" style="width:80px;margin-right:10px">
+                  <Option value="AND" key="AND">AND</Option>
+                  <Option value="OR" key="OR">OR</Option>
+                  <Option value="NOT" key="NOT">NOT</Option>
+                </Select>
+                <Input class="txt" @on-enter="addTag()" :clearable="true" v-model="tag" placeholder="输入搜索条件"
+                       style="width:196px;"/>
+                <Button icon="md-add" @click="addTag" style="margin-left:10px">添加</Button>
+                <a href="javascript:void(0)" @click="useSearchQuery=false" class="link_changeModal">切换为内容模式</a>
+              </td>
+            </tr>
+            <tr v-if="useSearchQuery">
+              <td></td>
+              <td>
+                <Tag closable v-for="(tag,index) in searchOptions" @on-close="closeTag(index)" :key="index">
+                  <template v-if="index>0">{{ tag.type }}&nbsp;</template>
+                  {{ tag.tag }}
+                </Tag>
+              </td>
+            </tr>
+            <tr>
+              <td></td>
+              <td style='padding-top:8px;position:relative'>
+                <Button type="primary" icon="ios-search" style="margin-right:10px" @click="doSearch">查询</Button>
+                <Button @click="clear">重置</Button>
+              </td>
+            </tr>
+          </table>
+        </div>
         <!-- 统计图表 -->
         <Carousel v-model="slideIndex" arrow="never">
           <CarouselItem>
@@ -82,72 +167,6 @@
             <div id="errorChart" class="chart"></div>
           </CarouselItem>
         </Carousel>
-
-        <div style="clear:both"></div>
-        <table class="tbl_filters" style="width:900px">
-          <tr v-if="extendList.length>0">
-            <td class="key">扩展字段</td>
-            <td>
-              <Select v-model="select_extend" @on-change="selectExtendHandler" label-in-value placeholder="选择扩展字段" style="width:150px;margin-right:10px">
-                <Option v-for="extend in extendList" :value="extend.field" :key="extend.field">{{
-                    extend.fieldName
-                  }}
-                </Option>
-              </Select>
-              <Input class="txt" @on-enter="addExtendTag" :clearable="true" v-model="extendTag" placeholder="输入查询内容"
-                     style="width:478px;"/>
-              <Button icon="md-add" @click="addExtendTag" style="margin-left:10px;width:100px">添加</Button>
-            </td>
-          </tr>
-          <tr v-if="extendOptions.length>0">
-            <td></td>
-            <td>
-              <Tag closable v-for="(tag,index) in extendOptions" size="medium" @on-close="closeExtendTag(index)"
-                   :key="index">
-                <template v-if="index>0">{{ tag.type }}&nbsp;</template>
-                {{ tag.label }}:{{ tag.tag }}
-              </Tag>
-            </td>
-          </tr>
-          <tr v-if="!useSearchQuery">
-            <td class="key">内容</td>
-            <td>
-              <Input class="txt" @on-enter="doSearch()" :clearable="true" style="width:638px" placeholder="输入搜索内容"
-                     v-model="searchKey"/>
-              <a href="javascript:void(0)" @click="useSearchQuery=true" class="link_changeModal">切换为条件模式</a>
-            </td>
-          </tr>
-          <tr v-if="useSearchQuery">
-            <td class="key">条件</td>
-            <td>
-              <Select v-if="searchOptions.length>0" v-model="selectOption" style="width:80px;margin-right:10px">
-                <Option value="AND" key="AND">AND</Option>
-                <Option value="OR" key="OR">OR</Option>
-                <Option value="NOT" key="NOT">NOT</Option>
-              </Select>
-              <Input class="txt" @on-enter="addTag()" :clearable="true" v-model="tag" placeholder="输入搜索条件"
-                     style="width:196px;"/>
-              <Button icon="md-add" @click="addTag" style="margin-left:10px">添加</Button>
-              <a href="javascript:void(0)" @click="useSearchQuery=false" class="link_changeModal">切换为内容模式</a>
-            </td>
-          </tr>
-          <tr v-if="useSearchQuery">
-            <td></td>
-            <td>
-              <Tag closable v-for="(tag,index) in searchOptions" @on-close="closeTag(index)" :key="index">
-                <template v-if="index>0">{{ tag.type }}&nbsp;</template>
-                {{ tag.tag }}
-              </Tag>
-            </td>
-          </tr>
-          <tr>
-            <td></td>
-            <td style='padding-top:8px;position:relative'>
-              <Button type="primary" icon="ios-search" style="margin-right:10px" @click="doSearch">查询</Button>
-              <Button @click="clear">重置</Button>
-            </td>
-          </tr>
-        </table>
       </template>
       <div style="clear:both"></div>
     </div>
@@ -180,6 +199,10 @@
           {{ row.appName }}
           <Icon type="ios-search" v-if="row.appName" @click="doSearch('appName',row)"/>
         </template>
+        <template slot-scope="{ row }" slot="env">
+          {{ row.env }}
+          <Icon type="ios-search" v-if="row.env" @click="doSearch('env',row)"/>
+        </template>
         <template slot-scope="{ row }" slot="traceId">
           <a :href="'./#/trace?traceId='+row.traceId+'&timeRange='+JSON.stringify(dateTimeRange)"
              title="点击查看链路追踪">{{ row.traceId }}</a>
@@ -271,7 +294,10 @@ export default {
       select_extend: "",
       select_extend_label: "",
       completeFilterLoading: false,
+      appNameWithEnvMap: {},
+      envWithAppNameMap: {},
       appNameComplete: [],
+      envComplete: [],
       useSearchQuery: false,
       selectOption: 'AND',
       isExclude: false,
@@ -297,6 +323,11 @@ export default {
           value: 'appName',
           width: 150
         },
+        {
+          label: '应用环境',
+          value: 'env',
+          width: 100
+        },
         {
           label: '追踪码',
           value: 'traceId',
@@ -321,6 +352,7 @@ export default {
       filter: {
         "logLevel": '',
         "appName": "",
+        "env": "",
         "traceId": "",
         "className": "",
         "serverName": ""
@@ -328,7 +360,7 @@ export default {
       list: {
         hits: []
       },
-      size: 30,
+      size: 100,
       from: 0,
       columns: [
         {
@@ -383,6 +415,16 @@ export default {
           resizable: true,
           width: 150
         },
+        {
+          title: '应用环境',
+          align: 'center',
+          key: 'env',
+          slot: 'env',
+          className: 'icon',
+          sortable: true,
+          resizable: true,
+          width: 100
+        },
         {
           title: '追踪码',
           align: 'center',
@@ -562,10 +604,10 @@ export default {
   },
   methods: {
     hightLightCode(code, isHighlight) {
-      code = code.replace(/\\n\\t/g, "\n").replace(/\\n\\tat/g, "\n").replace(/\\n/g, '\n');
+      code = code.replace(/\\n/g, '\n').replace(/\\t/g, '\t');
       let rows = [];
       if (code.indexOf('java.') > -1) {
-        let content = '<pre style="word-break:break-all;white-space: normal;">' + code.replace(/\n/g, '<br/>').replace(/&lt;/g, '<').replace(/&gt;/g, '>') + "</pre>"
+        let content = '<pre style="word-break:break-all;white-space: normal;">' + code.replace(/\n/g, '<br/>').replace(/\t/g, '　　').replace(/&lt;/g, '<').replace(/&gt;/g, '>') + "</pre>"
         rows.push({isH: true, content})
         return rows;
       } else if (isHtml.test(code)) {
@@ -594,15 +636,44 @@ export default {
         rows.push({isH: false, content})
         return rows;
       } else {
-        let content = '<div style="word-break:break-all;white-space: normal;">' + code.replace(/\n/g, '<br/>').replace(/\tat/g, '') + "</div>";
+        let content = '<div style="word-break:break-all;white-space: normal;">' + code.replace(/\n/g, '<br/>').replace(/\t/g, '　　') + "</div>";
         rows.push({isH: true, content})
         return rows;
       }
     },
     appNameChange() {
       this.getExtendList();
+      if (this.filter.appName) {
+        this.envComplete = this.appNameWithEnvMap[this.filter.appName];
+      } else {
+        this.envComplete = [];
+        for (let env in this.envWithAppNameMap) {
+          if (this.envWithAppNameMap.hasOwnProperty(env)) {
+            this.envComplete.push(env);
+          }
+        }
+      }
+      if (this.filter.env && this.envComplete.indexOf(this.filter.env) < 0) {
+        this.filter.env = '';
+      }
+      this.envComplete.sort(function(a, b){return a.localeCompare(b)});
+    },
+    envChange() {
+      if (this.filter.env) {
+        this.appNameComplete = this.envWithAppNameMap[this.filter.env];
+      } else {
+        this.appNameComplete = [];
+        for (let appName in this.appNameWithEnvMap) {
+          if (this.appNameWithEnvMap.hasOwnProperty(appName)) {
+            this.appNameComplete.push(appName);
+          }
+        }
+      }
+      if (this.filter.appName && this.appNameComplete.indexOf(this.filter.appName) < 0) {
+        this.filter.appName = '';
+      }
+      this.appNameComplete.sort(function(a, b){return a.localeCompare(b)});
     },
-    
     getExtendList() {
       this.allColumns = [
         ...this.allColumns
@@ -634,18 +705,18 @@ export default {
     searchAppName() {
       if (this.appNameComplete.length == 0) {
 
-        if (sessionStorage['cache_appNames']) {
-          this.appNameComplete = JSON.parse(sessionStorage['cache_appNames'])
+        if (sessionStorage['cache_appNameWithEnvs']) {
+          this.analysisAppNameWithEnv();
         } else {
           this.completeFilterLoading = true;
           let q = "plume_log_run_" + moment().format("YYYYMMDD") + '*'
-          axios.post(process.env.VUE_APP_API + '/query?index=' + q + '&from=0&size=0&appName', {
+          axios.post(process.env.VUE_APP_API + '/query?index=' + q + '&from=0&size=0&appNameWithEnv', {
             "size": 0,
             "aggregations": {
               "dataCount": {
                 "terms": {
                   "size": 1000,
-                  "field": "appName"
+                  "field": "appNameWithEnv"
                 }
               }
             }
@@ -654,13 +725,42 @@ export default {
             let buckets = _.get(data, 'data.aggregations.dataCount.buckets', []).map(item => {
               return item.key
             });
-            sessionStorage['cache_appNames'] = JSON.stringify(buckets);
-            this.appNameComplete = buckets;
+            sessionStorage['cache_appNameWithEnvs'] = JSON.stringify(buckets);
+            this.analysisAppNameWithEnv();
           })
-
         }
       }
     },
+    analysisAppNameWithEnv() {
+      let appNameWithEnvs = JSON.parse(sessionStorage['cache_appNameWithEnvs']);
+      this.appNameWithEnvMap = {};
+      this.envWithAppNameMap = {};
+      for (let i = 0,len = appNameWithEnvs.length; i < len; i++) {
+        let splitStr = appNameWithEnvs[i].split('-_-');
+        if (!this.appNameWithEnvMap[splitStr[0]]) {
+          this.appNameWithEnvMap[splitStr[0]] = [];
+        }
+        this.appNameWithEnvMap[splitStr[0]].push(splitStr[1]);
+        if (!this.envWithAppNameMap[splitStr[1]]) {
+          this.envWithAppNameMap[splitStr[1]] = [];
+        }
+        this.envWithAppNameMap[splitStr[1]].push(splitStr[0]);
+      }
+      this.appNameComplete = [];
+      for (let appName in this.appNameWithEnvMap) {
+        if (this.appNameWithEnvMap.hasOwnProperty(appName)) {
+          this.appNameComplete.push(appName);
+        }
+      }
+      this.appNameComplete.sort(function(a, b){return a.localeCompare(b)});
+      this.envComplete = [];
+      for (let env in this.envWithAppNameMap) {
+        if (this.envWithAppNameMap.hasOwnProperty(env)) {
+          this.envComplete.push(env);
+        }
+      }
+      this.envComplete.sort(function(a, b){return a.localeCompare(b)});
+    },
     closeExtendTag(index) {
       this.extendOptions.splice(index, 1);
     },
@@ -1210,6 +1310,9 @@ export default {
       if (this.$route.query.appName) {
         this.filter['appName'] = this.$route.query.appName;
       }
+      if (this.$route.query.env) {
+        this.filter['env'] = this.$route.query.env;
+      }
       if (this.$route.query.className) {
         this.filter['className'] = this.$route.query.className;
       }
diff --git a/plumelog-ui-front/src/views/Warn.vue b/plumelog-ui-front/src/views/Warn.vue
index 755745d3693db73042db28af44233455f7f3e1ae..76d58d08578cb71677e4cd496f5bd66b0d274609 100644
--- a/plumelog-ui-front/src/views/Warn.vue
+++ b/plumelog-ui-front/src/views/Warn.vue
@@ -37,6 +37,9 @@
                   <FormItem label="应用名称" required>
                     <Input v-model="dataInfo.appName" placeholder="输入应用名称"/>
                   </FormItem>
+                  <FormItem label="应用名称" required>
+                    <Input v-model="dataInfo.env" placeholder="输入应用环境"/>
+                  </FormItem>
                   <FormItem label="应用分类">
                     <Input v-model="dataInfo.appCategory" placeholder="输入应用分类"/>
                   </FormItem>
@@ -90,6 +93,7 @@
             <li v-for="(log,index) in logs" :key="index">
               <div class="time">{{ formatTime(log.dataTime) }}</div>
               <div class="cnt"><span class="key">应用名称: </span>{{ log.appName }}</div>
+              <div class="cnt"><span class="key">应用环境: </span>{{ log.env }}</div>
               <div class="cnt"><span class="key">类名: </span>{{ log.className }}</div>
               <div class="cnt"><span class="key">时间区间: </span>{{ log.time }}秒</div>
               <div class="cnt"><span class="key">实际错误: </span>{{ log.errorCount }}条</div>
@@ -133,6 +137,7 @@ export default {
       hookServeMap: {"1": '钉钉', "2": '企业微信', "3": '飞书', "4": '其他'},
       dataInfo: {
         appName: '',
+        env: '',
         appCategory: '',
         className: '',
         receiver: '',
@@ -165,7 +170,10 @@ export default {
         {
           title: '应用名称',
           key: 'appName'
-        }, {
+        },{
+          title: '应用环境',
+          key: 'env'
+        },{
           title: '应用分类',
           key: 'appCategory'
         },
@@ -298,6 +306,9 @@ export default {
         this.$Message.error('请填写间隔时间');
         return false;
       }
+      if (this.dataInfo.env == '') {
+        this.dataInfo.env = 'default';
+      }
       this.setData(this.dataInfo);
 
     },
@@ -332,6 +343,7 @@ export default {
     initDataInfo() {
       this.dataInfo = {
         appName: '',
+        env: '',
         appCategory: '',
         className: '',
         receiver: '',
@@ -408,6 +420,7 @@ export default {
         query: {
           className: info.className,
           appName: info.appName,
+          env: info.env,
           time: info.dataTime - 1000 * 60 + ',' + info.dataTime,
           logLevel: 'ERROR'
         }