opt: lucene日志

lms/nladmin-system/nlsso-server/pom.xml

@@ -291,9 +291,10 @@
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
         </dependency>
+        <!--        日志链路追踪 https://tlog.yomahub.com/pages/f62a84/#%E5%90%8C%E6%AD%A5%E6%97%A5%E5%BF%97-->
         <dependency>
             <groupId>com.yomahub</groupId>
-            <artifactId>tlog-core</artifactId>
+            <artifactId>tlog-all-spring-boot-starter</artifactId>
             <version>1.5.0</version>
         </dependency>
     </dependencies>

lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java

@@ -6,41 +6,86 @@ package org.nl.config.lucene;
  * @Date: 2023/8/25
  */
 public class LogMessageConstant {
-    /** */
+    /**
-    public final static String SORT_NAME = "time";
+     * 标签
-    /** 级别 */
+     */
+    public final static String FIELD_LABEL = "label";
+    /**
+     * 时间
+     */
+    public final static String FIELD_SORT_NAME = "time";
+    /**
+     * IP
+     */
+    public final static String FIELD_IP = "ip";
+    /**
+     * 级别
+     */
     public final static String FIELD_LEVEL = "level";
-    /** 时间 */
+    /**
+     * 时间
+     */
     public final static String FIELD_TIMESTAMP = "timestamp";
-    /** 类的限定名 */
+    /**
+     * 类的限定名
+     */
     public final static String FIELD_CLASS_NAME = "logger";
-    /** 线程名 */
+    /**
+     * 线程名
+     */
     public final static String FIELD_THREAD = "thread";
-    /** 日志内容 */
+    /**
+     * 日志内容
+     */
     public final static String FIELD_MESSAGE = "message";
+    /**
+     * tlogTraceId
+     */
     public final static String FIELD_TRACEID = "tlogTraceId";
     // 定义颜色值
-    /** 文本颜色：黑色 */
+    /**
+     * 文本颜色：黑色
+     */
     public final static String COLOR_BLACK = "\u001B[30m";
-    /** 文本颜色：红色 */
+    /**
+     * 文本颜色：红色
+     */
     public final static String COLOR_RED = "\u001B[31m";
-    /** 文本颜色：绿色 */
+    /**
+     * 文本颜色：绿色
+     */
     public final static String COLOR_GREEN = "\u001B[32m";
-    /** 文本颜色：黄色 */
+    /**
+     * 文本颜色：黄色
+     */
     public final static String COLOR_YELLOW = "\u001B[33m";
-    /** 文本颜色：蓝色 */
+    /**
+     * 文本颜色：蓝色
+     */
     public final static String COLOR_BLUE = "\u001B[34m";
-    /** 文本颜色：品红色 */
+    /**
+     * 文本颜色：品红色
+     */
     public final static String COLOR_MAGENTA = "\u001B[35m";
-    /** 文本颜色：青色 */
+    /**
+     * 文本颜色：青色
+     */
     public final static String COLOR_CYAN = "\u001B[36m";
-    /** 文本颜色：白色 */
+    /**
+     * 文本颜色：白色
+     */
     public final static String COLOR_WHITE = "\u001B[37m";
-    /** 文本颜色重置 */
+    /**
+     * 文本颜色重置
+     */
     public final static String COLOR_RESET = "\u001B[0m";
-    /** 背景颜色：黄色 */
+    /**
+     * 背景颜色：黄色
+     */
     public final static String BACKGROUND_YELLOW = "\u001B[43m";
-    /** 索引路径 */
+    /**
-    public final static String INDEX_DIR = "E:\\lucene\\index";
+     * 索引路径
+     */
+    public final static String INDEX_DIR = "D:\\software\\lucene\\index";
 
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java

@@ -8,6 +8,8 @@ package org.nl.config.lucene;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.AppenderBase;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.ttl.TransmittableThreadLocal;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.analysis.Analyzer;
@@ -20,6 +22,8 @@ import org.nl.common.utils.YmlConfigFileUtil;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Map;
@@ -58,26 +62,36 @@ public class LuceneAppender extends AppenderBase<ILoggingEvent> {
 
     @Override
     protected void append(ILoggingEvent event) {
+        String message = event.getFormattedMessage();
+        Map<String, String> mdcPropertyMap = event.getMDCPropertyMap();
         Document doc = new Document();
-        for (Property property : this.properties.getProperties()) {
+        long timeStamp = event.getTimeStamp();
-            LucenePropertyAndEncoder encoder = new LucenePropertyAndEncoder(property, this.context);
+        // 获取本机的IP地址
-            String encode = encoder.encode(event);
+        String ipAddress = "-";
-            doc.add(new StringField(property.getName(), encode, Field.Store.YES));
+        try {
+            ipAddress = InetAddress.getLocalHost().getHostAddress();
+        } catch (UnknownHostException e) {
+            throw new RuntimeException(e);
         }
-        Map<String, String> map = event.getMDCPropertyMap();
+        String formattedDateTime = DateUtil.format(new java.util.Date(timeStamp), "yyyy-MM-dd HH:mm:ss.SSS");
-        if (!map.isEmpty() && StringUtils.isNotEmpty(map.get("traceId"))){
+        doc.add(new LongPoint(LogMessageConstant.FIELD_SORT_NAME, timeStamp));
-            doc.add(new StringField("traceId",map.get("traceId"), Field.Store.YES));
+        doc.add(new NumericDocValuesField(LogMessageConstant.FIELD_SORT_NAME, timeStamp));
-        }else {
+        doc.add(new StringField(LogMessageConstant.FIELD_LEVEL, event.getLevel().toString(), Field.Store.YES));
-            doc.add(new StringField("traceId"," ", Field.Store.YES));
+        doc.add(new StringField(LogMessageConstant.FIELD_TIMESTAMP, formattedDateTime, Field.Store.YES));
+        doc.add(new StoredField(LogMessageConstant.FIELD_CLASS_NAME, event.getLoggerName()));
+        doc.add(new StoredField(LogMessageConstant.FIELD_IP, ipAddress));
+        doc.add(new StoredField(LogMessageConstant.FIELD_THREAD, event.getThreadName()));
+        if (ObjectUtil.isNotEmpty(mdcPropertyMap) && ObjectUtil.isNotEmpty(mdcPropertyMap.get(LogMessageConstant.FIELD_TRACEID))) {
+            String traceId = mdcPropertyMap.get(LogMessageConstant.FIELD_TRACEID);
+            doc.add(new StringField(LogMessageConstant.FIELD_TRACEID, traceId, Field.Store.YES));
+            doc.add(new StringField(LogMessageConstant.FIELD_LABEL, ObjectUtil.isNotEmpty(mdcPropertyMap.get("tag_name"))
+                    ? mdcPropertyMap.get("tag_name") : "-", Field.Store.YES));
         }
-
+        doc.add(new TextField(LogMessageConstant.FIELD_MESSAGE, message, 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()));
         try {
             indexWriter.addDocument(doc);
             indexWriter.commit();
-        } catch (Exception e) {
+        } catch (IOException e) {
             e.printStackTrace();
         }
     }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java

@@ -0,0 +1,164 @@
+package org.nl.config.lucene;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.queryparser.classic.QueryParser;
+import org.apache.lucene.search.*;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.BytesRef;
+import org.wltea.analyzer.lucene.IKAnalyzer;
+
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+
+/**
+ * lucene查询器
+ */
+@Slf4j
+public class Searcher {
+
+    public static Map<String, Object> search(String indexDir, JSONObject whereJson) throws Exception {
+        //获取要查询的路径，也就是索引所在的位置
+        Directory dir = FSDirectory.open(Paths.get(indexDir));
+        IndexReader reader = DirectoryReader.open(dir);
+        //构建IndexSearcher
+        IndexSearcher searcher = new IndexSearcher(reader);
+        //标准分词器，会自动去掉空格啊，is a the等单词
+        Analyzer analyzer = new IKAnalyzer(true);
+
+        // 实际上Lucene本身不支持分页。因此我们需要自己进行逻辑分页。我们要准备分页参数：
+        // 每页条数
+        int pageSize = Integer.parseInt(whereJson.get("size").toString());
+        // 当前页码
+        int pageNum = Integer.parseInt(whereJson.get("page").toString()) - 1;
+        // 当前页的起始条数
+        int start = pageNum * pageSize;
+        // 当前页的结束条数（不能包含）
+        int end = start + pageSize;
+        // 创建排序对象,需要排序字段SortField，参数：字段的名称、字段的类型、是否反转如果是false，升序。true降序
+        Sort sort = new Sort(new SortField(LogMessageConstant.FIELD_SORT_NAME, SortField.Type.LONG, true));
+
+        TopDocs docs = null;
+        BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(1970, 0, 1);
+        //时间范围查询
+        JSONArray createTime = whereJson.getJSONArray("createTime");
+        String startDate = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss.SSS");
+        String endDate = DateUtil.format(new DateTime(), "yyyy-MM-dd HH:mm:ss.SSS");
+
+        if (createTime != null) {
+            startDate = createTime.getString(0);
+            endDate = createTime.getString(1);
+        }
+        // 字段之间的与或非关系，MUST表示and，MUST_NOT表示not，SHOULD表示or，有几个fields就必须有几个clauses
+        TermRangeQuery termRangeQuery = new TermRangeQuery("timestamp", new BytesRef(startDate),
+                new BytesRef(endDate), true, true);
+        booleanQueryBuilder.add(termRangeQuery, BooleanClause.Occur.MUST);
+        if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_MESSAGE))) {
+            //查询解析器
+            QueryParser queryParser = new QueryParser("message", analyzer);
+            Query query = queryParser.parse("message:" + whereJson.getString("message") + "~");
+            booleanQueryBuilder.add(query, BooleanClause.Occur.MUST);
+        }
+        if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_TRACEID))) {
+            //查询解析器
+            TermQuery termQuery = new TermQuery(new Term(LogMessageConstant.FIELD_TRACEID,
+                    whereJson.getString(LogMessageConstant.FIELD_TRACEID).trim()));
+            booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST);
+        }
+        if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_LABEL))) {
+            //查询解析器
+            TermQuery termQuery = new TermQuery(new Term(LogMessageConstant.FIELD_LABEL,
+                    whereJson.getString(LogMessageConstant.FIELD_LABEL).trim()));
+            booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST);
+        }
+        if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_LEVEL))) {
+            //查询解析器
+            TermQuery termQuery = new TermQuery(new Term(LogMessageConstant.FIELD_LEVEL,
+                    whereJson.get(LogMessageConstant.FIELD_LEVEL).toString()));
+            booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST);
+        }
+        // 使用实体接收
+        List<String> list = new ArrayList<>();
+        TopFieldCollector collector = TopFieldCollector.create(sort, 20000, 0);
+        searcher.search(booleanQueryBuilder.build(), collector);
+        docs = collector.topDocs(pageNum*pageSize, pageSize);
+        ScoreDoc[] scoreDocs = docs.scoreDocs;
+        int totalSize = collector.getTotalHits();
+
+        for (ScoreDoc scoreDoc : scoreDocs) {
+            Document doc = reader.document(scoreDoc.doc);
+            String logInfo = LogMessageConstant.COLOR_RED + doc.get(LogMessageConstant.FIELD_TIMESTAMP) +
+                    LogMessageConstant.COLOR_RESET + " - " +
+                    LogMessageConstant.COLOR_BLUE + doc.get(LogMessageConstant.FIELD_IP) +
+                    LogMessageConstant.COLOR_RESET + " - " +
+                    LogMessageConstant.COLOR_GREEN + "[" + doc.get(LogMessageConstant.FIELD_THREAD) + "]" +
+                    LogMessageConstant.COLOR_RESET + " - " +
+                    LogMessageConstant.COLOR_BLACK + doc.get(LogMessageConstant.FIELD_LEVEL) +
+                    LogMessageConstant.COLOR_RESET + " - " +
+                    LogMessageConstant.COLOR_MAGENTA + doc.get(LogMessageConstant.FIELD_CLASS_NAME) +
+                    LogMessageConstant.COLOR_RESET + " - " +
+                    LogMessageConstant.COLOR_GREEN + "<" + doc.get(LogMessageConstant.FIELD_TRACEID) + ">" +
+                    LogMessageConstant.COLOR_RESET + " - " +
+                    LogMessageConstant.COLOR_BLACK + highlightKeyword(doc.get(LogMessageConstant.FIELD_MESSAGE), whereJson.getString("message"));
+            list.add(logInfo);
+        }
+        reader.close();
+        JSONObject jo = new JSONObject();
+        jo.put("content", list);
+        jo.put("totalElements", totalSize);
+        return jo;
+    }
+
+    public static String highlightKeyword(String text, String keyword) {
+        if (ObjectUtil.isEmpty(keyword)) {
+            return text;
+        }
+
+        int startIndex = text.indexOf(keyword);
+        if (startIndex != -1) {
+            int endIndex = startIndex + keyword.length();
+            String beforeKeyword = text.substring(0, startIndex);
+            String afterKeyword = text.substring(endIndex);
+            String highlightedKeyword = LogMessageConstant.BACKGROUND_YELLOW + keyword + LogMessageConstant.COLOR_RESET
+                    + LogMessageConstant.COLOR_BLACK;
+            return beforeKeyword + highlightedKeyword + afterKeyword;
+        } else {
+            return text;
+        }
+    }
+
+    public static void main(String[] args) throws IOException, ParseException {
+        // 获取当前时间
+        LocalDateTime now = LocalDateTime.now();
+        // 减去七天
+        LocalDateTime sevenDaysAgo = now.minus(7, ChronoUnit.DAYS);
+        // 转换为 Date 类型
+        Date sevenDaysAgoDate = Date.from(sevenDaysAgo.atZone(ZoneId.systemDefault()).toInstant());
+        // 获取时间戳
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
+        Date date = dateFormat.parse(String.valueOf(sevenDaysAgo));
+        long timestamp = date.getTime();
+        System.out.println(now);
+        System.out.println(sevenDaysAgo);
+        System.out.println(sevenDaysAgoDate);
+        System.out.println(timestamp);
+    }
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/controller/lucence/LuceneLogController.java

@@ -1,6 +1,8 @@
 package org.nl.wms.system_manage.controller.lucence;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.alibaba.fastjson.JSONObject;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.logging.annotation.Log;
 import org.nl.wms.system_manage.service.logserver.LogQuery;
@@ -16,9 +18,9 @@ import org.springframework.web.bind.annotation.*;
  * @date 2023年01月29日 18:55
  * @desc desc
  */
-
 @RestController
-@RequestMapping("/api/esLog")
+@RequiredArgsConstructor
+@RequestMapping("/api/lucene")
 @Slf4j
 public class LuceneLogController {
 
@@ -26,44 +28,13 @@ public class LuceneLogController {
     private LuceneLogService luceneLogService;
 
 
-    @GetMapping("/labels/{type}")
+    @PostMapping("/getAll")
-    //("获取标签")
+    public ResponseEntity<Object> get(@RequestBody JSONObject whereJson) {
-    public ResponseEntity<Object> labelsValues(@PathVariable String type) {
+        return new ResponseEntity<>(luceneLogService.getAll(whereJson), HttpStatus.OK);
-        return new ResponseEntity<>(luceneLogService.getLabelsValues(type), HttpStatus.OK);
     }
 
-    @PostMapping("/query")
+    @PostMapping("/getTagName")
-    //("日志查询")
+    public ResponseEntity<Object> getTagName() {
-   public ResponseEntity<Object> queryAll(@RequestBody LogQuery query) {
+        return new ResponseEntity<>(luceneLogService.getTagName(), HttpStatus.OK);
-        return new ResponseEntity<>(luceneLogService.query(query), HttpStatus.OK);
     }
-    @DeleteMapping("/clearLogs")
-    //("清空日志")
-    public ResponseEntity<Object> clearLogs(@RequestBody LogQuery query) {
-        luceneLogService.clearLogs(query);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
-    @GetMapping("/thread")
-    @SaIgnore
-    @Log("线程追踪测试")
-    //("清空日志")
-    public ResponseEntity<Object> thread(@RequestBody LogQuery query) {
-        log.info("线程链路测试"+Thread.currentThread().getName());
-        log.error("线程链路测试"+Thread.currentThread().getName());
-        luceneLogService.syncdemo();
-        Thread thread = new Thread(()->{
-            try {
-                Thread.sleep(5000);
-                log.info("线程链路测试"+Thread.currentThread().getName());
-                log.error("线程链路测试"+Thread.currentThread().getName());
-                log.info("线程链路测试"+Thread.currentThread().getName());
-            }catch (Exception ex){
-                ex.printStackTrace();
-            }
-        });
-        thread.start();
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/enums/TagNameEnum.java

@@ -0,0 +1,23 @@
+package org.nl.wms.system_manage.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author: lyd
+ * @Description: 日志标签枚举
+ * @Date: 2023/12/28
+ */
+@Getter
+@AllArgsConstructor
+public enum TagNameEnum {
+    /**
+     * LMS系统
+     */
+    LMS("LMS系统"),
+    /**
+     * 标记符号
+     */
+    MARK_SYMBOL("-");
+    private final String tag;
+}

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LuceneLogService.java

@@ -3,6 +3,9 @@ package org.nl.wms.system_manage.service.logserver;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author ldjun
  * @version 1.0
@@ -12,21 +15,16 @@ import com.alibaba.fastjson.JSONObject;
 public interface LuceneLogService {
 
     /**
-     * 清空日志
+     * 获取数据分页
+     *
+     * @param whereJson 条件
+     * @return Map<String, Object>
      */
-    void clearLogs(LogQuery query);
+    Map<String, Object> getAll(JSONObject whereJson);
-    /**
-     * 获取labels和values树
-     * @return
-     */
-    JSONArray getLabelsValues(String type);
 
     /**
-     * 日志查询
+     * 获取枚举的标签名称
-     * @param logQuery
      * @return
      */
-    JSONObject query(LogQuery logQuery);
+    List<String> getTagName();
-
-    void syncdemo();
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logserver/LuceneLogServiceImpl.java

@@ -17,156 +17,47 @@ import org.apache.lucene.search.*;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.util.BytesRef;
 import org.nl.common.exception.BadRequestException;
+import org.nl.config.language.LangProcess;
 import org.nl.config.lucene.LuceneAppender;
+import org.nl.config.lucene.Searcher;
+import org.nl.wms.system_manage.enums.TagNameEnum;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.wltea.analyzer.lucene.IKAnalyzer;
 
 import java.nio.file.Paths;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Calendar;
+import java.util.stream.Collectors;
-import java.util.Date;
-import java.util.List;
 
 @Service
 @Slf4j
 public class LuceneLogServiceImpl implements LuceneLogService {
-
+    /**
-    static String[] INFO_LEVEL = new String[]{"DEBUG","INFO","WARN","ERROR"};
+     * 日志索引目录
-
+     */
     @Value("${lucene.index.path}")
-    private String indexUrl;
+    private  String luceneUrl;
 
     @Override
-    public void clearLogs(LogQuery query) {
+    public Map<String, Object> getAll(JSONObject whereJson) {
+        JSONObject jo = new JSONObject();
         try {
-            IndexWriter indexWriter = LuceneAppender.indexWriter;
+            JSONObject jsonObject = (JSONObject) Searcher.search(luceneUrl, whereJson);
-            if (indexWriter != null){
+            JSONArray array = jsonObject.getJSONArray("content");
-                BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
+            int totalElements = Integer.parseInt(jsonObject.get("totalElements").toString());
-                DateTime offset = DateUtil.offset(new Date(), DateField.HOUR_OF_DAY, -10);
+            jo.put("content", array);
-                TermRangeQuery termRangeQuery = new TermRangeQuery(
+            jo.put("totalElements", totalElements);
-                        "requestTime",null,
+        } catch (Exception e) {
-                        new BytesRef(DateUtil.format(offset, "yyyy-MM-dd HH:mm:ss.SSS")), true, true);
+            log.error("索引查询为空", e);
-                booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST);
+            throw new NullPointerException(LangProcess.msg("error_NullPoint"));
-                indexWriter.deleteDocuments(termRangeQuery);
-                indexWriter.commit();
-            }
-        }catch (Exception ex){
-            throw new BadRequestException("删除失败："+ex.getMessage());
         }
+
+        return jo;
     }
 
     @Override
-    public JSONArray getLabelsValues(String type) {
+    public List<String> getTagName() {
-        JSONArray result = new JSONArray();
+        return Arrays.stream(TagNameEnum.values()).map(TagNameEnum::getTag).collect(Collectors.toList());
-        for (String v : INFO_LEVEL) {
-            JSONObject item = new JSONObject();
-            item.put("label", v);
-            item.put("value", v);
-            result.add(item);
-        }
-        return result;
-    }
-
-
-    @Override
-    public JSONObject query(LogQuery logQuery) {
-        JSONObject res = new JSONObject();
-        PageResult page = new PageResult();
-        page.setPage(logQuery.getPage());
-        page.setPageSize(logQuery.getSize());
-        try {
-            FSDirectory directory = FSDirectory.open(Paths.get(indexUrl));
-            DirectoryReader open = DirectoryReader.open(directory);
-            IndexSearcher searcher = new IndexSearcher(open);
-            // 创建排序对象,需要排序字段SortField，参数：字段的名称、字段的类型、是否反转如果是false，升序。true降序
-            BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
-            //时间范围查询
-            Date startDate = logQuery.getStartTime();
-            Date endDate =  logQuery.getEndTime();
-
-            if (startDate == null){
-                Calendar calendar=Calendar.getInstance();
-                calendar.set(1970, 0, 1);
-                startDate = calendar.getTime(); }
-            if (endDate == null){ endDate = new DateTime(); }
-            TermRangeQuery termRangeQuery = new TermRangeQuery(
-                    "requestTime",
-                    new BytesRef(DateUtil.format(startDate, "yyyy-MM-dd HH:mm:ss.SSS")),
-                    new BytesRef(DateUtil.format(endDate, "yyyy-MM-dd HH:mm:ss.SSS")), true, true);
-            booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST);
-
-            // 字段之间的与或非关系，MUST表示and，MUST_NOT表示not，SHOULD表示or，有几个fields就必须有几个clauses
-            if (ObjectUtil.isNotEmpty(logQuery.getTraceId())){
-                TermQuery termQuery = new TermQuery(new Term("traceId", logQuery.getTraceId()));
-                booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST);
-            }
-            if (ObjectUtil.isNotEmpty(logQuery.getLogLevel())){
-                TermQuery termQuery = new TermQuery(new Term("logLevel", logQuery.getLogLevel()));
-                booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST);
-            }
-            if (ObjectUtil.isNotEmpty(logQuery.getSystem())) {
-                TermQuery termQuery = new TermQuery(new Term("system", logQuery.getSystem()));
-                booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST);
-            }
-            if (ObjectUtil.isNotEmpty(logQuery.getRequestMethod())) {
-                TermQuery termQuery = new TermQuery(new Term("requestMethod", logQuery.getRequestMethod()));
-                booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST);
-            }
-            if (Boolean.TRUE.equals(logQuery.getIsRequest())) {
-                Term traceid = new Term("traceId");
-                TermQuery termQuery = new TermQuery(traceid);
-                booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST_NOT);
-            }
-            if (ObjectUtil.isNotEmpty(logQuery.getMessage())){
-                //查询解析器
-                QueryParser queryParser = new QueryParser("message", new IKAnalyzer(true));
-                Query query = queryParser.parse(logQuery.getMessage());
-                booleanQueryBuilder.add(query, BooleanClause.Occur.MUST);
-            }
-
-            TopFieldCollector collector = TopFieldCollector.create(new Sort(new SortField("time", SortField.Type.LONG,true)), 20000, 0);
-            searcher.search(booleanQueryBuilder.build(), collector);
-            TopDocs topDocs = collector.topDocs((logQuery.getPage()-1)*logQuery.getSize(), logQuery.getSize());
-            int totalSize = collector.getTotalHits();
-            ScoreDoc[] scoreDocs = topDocs.scoreDocs;
-
-            List<LogRepositoryDTO> list = new ArrayList<>();
-            for (ScoreDoc scoreDoc : scoreDocs) {
-                Document doc = open.document(scoreDoc.doc);
-                LogRepositoryDTO dto = new LogRepositoryDTO();
-                dto.setSystem(doc.get("system"));
-                dto.setTraceId(doc.get("traceId"));
-                dto.setLogger(doc.get("logger"));
-                dto.setLogLevel(doc.get("logLevel"));
-                dto.setMessage(doc.get("message"));
-                dto.setRequestIp(doc.get("requestIp"));
-                dto.setRequestMethod(doc.get("requestMethod"));
-                dto.setRequestTime(doc.get("requestTime"));
-                dto.setThread(doc.get("thread"));
-                list.add(dto);
-            }
-            open.close();
-            directory.close();
-            page.addAll(list);
-            page.setTotal(scoreDocs.length);
-            res.put("total", totalSize);
-        }catch (Exception ex){
-            ex.printStackTrace();
-        }
-        res.put("page",page);
-        return res;
-
-    }
-
-
-    @Override
-    @Async
-    public void syncdemo() {
-        log.info("Async线程链路测试"+Thread.currentThread().getName());
-        log.error("Async线程链路测试"+Thread.currentThread().getName());
-        log.info("Async线程链路测试"+Thread.currentThread().getName());
-        log.info("线程链路测试"+Thread.currentThread().getName());
     }
 }

lms/nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml

@@ -9,10 +9,11 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:wms_standardv1}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:zzzw_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
-      # url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms_oulun}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+#      url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:zzzw_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
-      password: ${DB_PWD:123456}
+      password: ${DB_PWD:P@ssw0rd.}
+#      password: ${DB_PWD:12356}
       # 初始连接数
       initial-size: 15
       # 最小连接数
@@ -134,6 +135,3 @@ sa-token:
   token-prefix:
   is-read-cookie: false
   is-print: false
-lucene:
-  index:
-    path: D:\lms\lucene\index

lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -61,44 +61,33 @@
         <appender-ref ref="ErpLogFile"/>
     </appender>
     <appender name="luceneAppender" class="org.nl.config.lucene.LuceneAppender" >
-        <properties>
+        <!-- Filter for INFO level -->
-            <property>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                <name>system</name>
+            <level>INFO</level>
-                <value>lms</value>
+            <onMatch>ACCEPT</onMatch>
-            </property>
+            <onMismatch>NEXT</onMismatch>
-            <property>
+        </filter>
-                <name>logLevel</name>
+        <!-- Filter for WARN level -->
-                <value>%level</value>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            </property>
+            <level>WARN</level>
-            <property>
+            <onMatch>ACCEPT</onMatch>
-                <name>requestMethod</name>
+            <onMismatch>NEXT</onMismatch>
-                <value>%X{requestMethod}</value>
+        </filter>
-            </property>
+        <!-- Filter for ERROR level -->
-            <property>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-                <name>requestTime</name>
+            <level>ERROR</level>
-                <value>%d{yyyy-MM-dd HH:mm:ss.SSS}</value>
+            <onMatch>ACCEPT</onMatch>
-            </property>
+            <onMismatch>DENY</onMismatch>
-            <property>
+        </filter>
-                <name>requestIp</name>
-                <value>%X{requestIp}</value>
-            </property>
-            <property>
-                <name>thread</name>
-                <value>%thread</value>
-            </property>
-            <property>
-                <name>logger</name>
-                <value>%logger</value>
-            </property>
-        </properties>
     </appender>
-    <appender name="asyncLuceneAppender" class="org.nl.config.lucene.AsyncLuceneAppender">
+    <appender name="asyncLuceneAppender" class="ch.qos.logback.classic.AsyncAppender">
         <appender-ref ref="luceneAppender" />
+        <!-- 设置队列大小 -->
         <queueSize>512</queueSize>
     </appender>
 
     <!--开发环境:打印控制台-->
-    <springProfile name="dev">
+    <springProfile name="prod">
         <root level="info">
             <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="CONSOLE"/>
@@ -138,7 +127,48 @@
         </logger>
     </springProfile>
     <!--测试环境:打印控制台-->
-
+    <springProfile name="dev">
+        <root level="INFO">
+            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="asyncLuceneAppender"/>
+        </root>
+        <logger name="org.springframework" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.apache" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.hibernate" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="io.netty" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="jdbc" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="io.lettuce" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="com.fasterxml" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.quartz" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="com.google" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="springfox" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="log4jdbc" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="nl.basjes" level="ERROR" additivity="false">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+    </springProfile>
     <!--生产环境:打印控制台和输出到文件-->
 
 </configuration>

lms/nladmin-ui/src/views/lucene/index.vue

@@ -62,6 +62,15 @@
             :end-placeholder="$t('Log.end_time')"
           />
         </el-form-item>
+        <el-form-item label="压缩查看" prop="isRequest">
+          <el-switch
+            v-model="compressedView"
+            active-color="#409EFF"
+            inactive-color="#F56C6C"
+            :active-value="true"
+            :inactive-valu="false"
+          />
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" size="mini" @click="queryData">
             {{ $t('common.Query') }}
@@ -73,7 +82,8 @@
     <el-card shadow="hover" style="width: 100%" class="log-warpper">
       <div style="width: 100%">
         <div v-for="(log, index) in logs" :key="index">
-          <div style="margin-bottom: 5px; font-size: 14px;" v-html="log" />
+          <div v-if="compressedView === false" style="margin: 5px;font-size: 16px; word-break: break-all; white-space: pre-wrap;" v-html="log" />
+          <div v-else style="margin-bottom: 5px; font-size: 16px;" v-html="log" />
         </div>
       </div>
     </el-card>
@@ -126,7 +136,8 @@ export default {
         size: 100,
         total: 0,
         createTime: ''
-      }
+      },
+      compressedView: true
     }
   },
   created() {