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 adb35de0..58dcc5c4 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 @@ -68,8 +68,9 @@ 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)); 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 7eff33af..f9963f97 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 @@ -18,6 +18,7 @@ import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.search.*; import org.apache.lucene.store.FSDirectory; import org.apache.lucene.util.BytesRef; +import org.nl.config.lucene.LuceneAppender; import org.nl.exception.BadRequestException; import org.nl.modules.system.domain.LogRepositoryDTO; import org.nl.modules.system.service.EsLogService; @@ -143,19 +144,16 @@ public class EsLogServiceImpl implements EsLogService { public void clearLogs(LogQuery logQuery) { 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, 1); 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/config/application-dev.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml index 3cd89dcb..8e335f22 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -152,4 +152,7 @@ logging: config: classpath:logback-spring.xml es: index: whxr_log +lucene: + index: + path: D:\lms\lucene\index diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml index 1eb889a7..8b066499 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -152,3 +152,6 @@ logging: config: classpath:logback-spring.xml es: index: whxr_log +lucene: + index: + path: D:\lms\lucene\index diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-test.yml b/mes/hd/nladmin-system/src/main/resources/config/application-test.yml index 250e563b..fcf52700 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-test.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-test.yml @@ -147,3 +147,6 @@ logging: file: path: C:\log\wms config: classpath:logback-spring.xml +lucene: + index: + path: D:\lms\lucene\index diff --git a/mes/hd/nladmin-system/src/main/resources/config/application.yml b/mes/hd/nladmin-system/src/main/resources/config/application.yml index 0d975984..949b17da 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application.yml @@ -47,4 +47,4 @@ logging: config: classpath:logback-spring.xml lucene: index: - path: E:\lms\lucene\index + path: D:\lms\lucene\index