diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java index 9e483c84..1ee68525 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java @@ -46,16 +46,14 @@ public class DruidFilter extends FilterEventAdapter { try { count=statement.getUpdateCount(); }catch (Exception ex){ } - if (StringUtils.isNotEmpty(traceId) && count>0) { - if (size > 0) { - Collection values = statement.getParameters().values(); - List params = new ArrayList<>(); - for (JdbcParameter value : values) { - params.add(value.getValue()); - } - executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params); + if (true) { + Collection values = statement.getParameters().values(); + List params = new ArrayList<>(); + for (JdbcParameter value : values) { + params.add(value.getValue()); } - log.info("[----SQL----][update][ SQL: {} ]", executeSql); + executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params); + log.info("[----SQL----][update][执行结果:{}][ SQL: {} ]",count,executeSql); } super.statementExecuteAfter(statement, sql, result); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/LuceneAppender.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/LuceneAppender.java index 58dcc5c4..e629f61c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/LuceneAppender.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/LuceneAppender.java @@ -71,6 +71,7 @@ public class LuceneAppender extends AppenderBase { }else { doc.add(new StringField("traceId"," ", Field.Store.YES)); } + doc.add(new StringField(LogMessageConstant.FIELD_CLASS_NAME, event.getLoggerName(), Field.Store.YES)); doc.add(new TextField(LogMessageConstant.FIELD_MESSAGE, event.getFormattedMessage(), Field.Store.YES)); doc.add(new StringField(LogMessageConstant.FIELD_TIMESTAMP, String.valueOf(event.getTimeStamp()),Field.Store.YES)); doc.add(new NumericDocValuesField(LogMessageConstant.SORT_NAME, event.getTimeStamp())); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java index f9963f97..78e35d4c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java @@ -147,7 +147,7 @@ public class EsLogServiceImpl implements EsLogService { IndexWriter indexWriter = LuceneAppender.indexWriter; if (indexWriter != null){ BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder(); - DateTime offset = DateUtil.offset(new Date(), DateField.HOUR_OF_DAY, 1); + DateTime offset = DateUtil.offset(new Date(), DateField.HOUR_OF_DAY, -7); TermRangeQuery termRangeQuery = new TermRangeQuery( "requestTime",null, new BytesRef(DateUtil.format(offset, "yyyy-MM-dd HH:mm:ss.SSS")), true, true); diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index dd4dfced..84fb5154 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -96,45 +96,60 @@ s - - - - - - - - + + + - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mes/qd/src/views/tools/es/view/index.vue b/mes/qd/src/views/tools/es/view/index.vue index f3b7c6d6..c9af170d 100644 --- a/mes/qd/src/views/tools/es/view/index.vue +++ b/mes/qd/src/views/tools/es/view/index.vue @@ -148,6 +148,7 @@ {{ log.system }} {{ log.thread }} {{ log.logLevel }} + {{ log.logger }} {{ log.requestIp }} {{ log.requestTime }} {{ log.traceId }}