diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneAppender.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneAppender.java index 9afb9793..9e1ee338 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneAppender.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/LuceneAppender.java @@ -69,6 +69,8 @@ public class LuceneAppender extends AppenderBase { Map map = event.getMDCPropertyMap(); if (!map.isEmpty() && StringUtils.isNotEmpty(map.get("traceId"))){ doc.add(new StringField("traceId",map.get("traceId"), Field.Store.YES)); + }else { + doc.add(new StringField("traceId"," ", Field.Store.YES)); } doc.add(new TextField(LogMessageConstant.FIELD_MESSAGE, event.getFormattedMessage(), Field.Store.YES)); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java index e9ce5654..b711e5cf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/LuceneLogServiceImpl.java @@ -47,20 +47,16 @@ public class LuceneLogServiceImpl implements LuceneLogService { @Override public void clearLogs(LogQuery query) { try { - // 初始化 Lucene 索引 - Analyzer analyzer = new IKAnalyzer(); - IndexWriterConfig config = new IndexWriterConfig(analyzer); - IndexWriter indexWriter = new IndexWriter(FSDirectory.open(Paths.get(indexUrl)), config); + IndexWriter indexWriter = LuceneAppender.indexWriter; if (indexWriter != null){ BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder(); - DateTime offset = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -10); + DateTime offset = DateUtil.offset(new Date(), DateField.HOUR_OF_DAY, -10); TermRangeQuery termRangeQuery = new TermRangeQuery( "requestTime",null, new BytesRef(DateUtil.format(offset, "yyyy-MM-dd HH:mm:ss.SSS")), true, true); booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST); indexWriter.deleteDocuments(termRangeQuery); indexWriter.commit(); - indexWriter.close(); } }catch (Exception ex){ throw new BadRequestException("删除失败:"+ex.getMessage()); 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 5d759d3e..7ef52230 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -81,6 +81,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -94,25 +118,28 @@ - + - + - + - + - + - + - + + + +