From 2bdea65231e2ba69614fbfe90122639df61c7f71 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 21 Dec 2023 19:21:08 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=85=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LuceneExecuteLogServiceImpl.java | 16 ++++++--- .../src/main/resources/log/AcsToLk.xml | 9 +++-- .../src/main/resources/log/AcsToMes.xml | 9 +++-- .../resources/log/AgvNdcOneDeviceDriver.xml | 8 ++++- .../resources/log/AgvNdcTwoDeviceDriver.xml | 8 ++++- .../src/main/resources/log/AutoCreateInst.xml | 8 ++++- .../main/resources/log/AutoCreateOneInst.xml | 8 ++++- .../src/main/resources/log/LkToAcs.xml | 8 ++++- .../src/main/resources/log/Lucene.xml | 34 ------------------- .../src/main/resources/log/MesToAcs.xml | 8 ++++- .../main/resources/log/NDCAgvServiceImpl.xml | 8 ++++- .../log/NDCSocketConnectionAutoRun.xml | 8 ++++- .../log/OneNDCSocketConnectionAutoRun.xml | 8 ++++- .../src/main/resources/log/OpcUtil.xml | 8 ++++- .../src/main/resources/logback-spring.xml | 21 ++++++------ 15 files changed, 106 insertions(+), 63 deletions(-) delete mode 100644 wcs/nladmin-system/src/main/resources/log/Lucene.xml diff --git a/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java b/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java index b5d8c66c..992e98a4 100644 --- a/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java +++ b/wcs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.modules.lucene.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -37,14 +38,20 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { @SneakyThrows @Override public void deviceExecuteLog(LuceneLogDto luceneLogDto) { - luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); - addIndex(luceneLogDto); + if (luceneLogDto!=null){ + log.info("log:{}", JSON.toJSONString(luceneLogDto)); + } +// luceneLogDto.setLogType(LogTypeEnum.DEVICE_LOG.getDesc()); +// addIndex(luceneLogDto); } @Override public void interfaceExecuteLog(LuceneLogDto luceneLogDto) throws IOException { - luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc()); - addIndex(luceneLogDto); + if (luceneLogDto!=null){ + log.info("log:{}", JSON.toJSONString(luceneLogDto)); + } +// luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc()); +// addIndex(luceneLogDto); } private void addIndex(LuceneLogDto luceneLogDto) throws IOException { @@ -82,6 +89,7 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { long endTime = System.currentTimeMillis(); log.info("建立索引共耗时{}毫秒", endTime - startTime); indexWriter.commit(); + indexWriter.close(); // MDC.put("DEVICECODE", luceneLogDto.getDevice_code()); } catch (Exception e) { log.error(e.getMessage(), e); diff --git a/wcs/nladmin-system/src/main/resources/log/AcsToLk.xml b/wcs/nladmin-system/src/main/resources/log/AcsToLk.xml index c8c2d049..8743e27c 100644 --- a/wcs/nladmin-system/src/main/resources/log/AcsToLk.xml +++ b/wcs/nladmin-system/src/main/resources/log/AcsToLk.xml @@ -19,7 +19,12 @@ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n ${log.charset} - + + + + 100 + 500 + - + diff --git a/wcs/nladmin-system/src/main/resources/log/AcsToMes.xml b/wcs/nladmin-system/src/main/resources/log/AcsToMes.xml index 07c3cc70..7be8c45f 100644 --- a/wcs/nladmin-system/src/main/resources/log/AcsToMes.xml +++ b/wcs/nladmin-system/src/main/resources/log/AcsToMes.xml @@ -21,13 +21,18 @@ - + + + 100 + 500 + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml b/wcs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml index 9e78afd7..ccc27ba7 100644 --- a/wcs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml +++ b/wcs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml @@ -22,12 +22,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml b/wcs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml index 6c2dd301..00dea2bb 100644 --- a/wcs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml +++ b/wcs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml @@ -22,12 +22,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/wcs/nladmin-system/src/main/resources/log/AutoCreateInst.xml index 8ca9f9b1..99e9e055 100644 --- a/wcs/nladmin-system/src/main/resources/log/AutoCreateInst.xml +++ b/wcs/nladmin-system/src/main/resources/log/AutoCreateInst.xml @@ -21,12 +21,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/AutoCreateOneInst.xml b/wcs/nladmin-system/src/main/resources/log/AutoCreateOneInst.xml index b0a7d883..496acb92 100644 --- a/wcs/nladmin-system/src/main/resources/log/AutoCreateOneInst.xml +++ b/wcs/nladmin-system/src/main/resources/log/AutoCreateOneInst.xml @@ -21,12 +21,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/LkToAcs.xml b/wcs/nladmin-system/src/main/resources/log/LkToAcs.xml index 2df63ce0..bd6150e9 100644 --- a/wcs/nladmin-system/src/main/resources/log/LkToAcs.xml +++ b/wcs/nladmin-system/src/main/resources/log/LkToAcs.xml @@ -22,12 +22,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/Lucene.xml b/wcs/nladmin-system/src/main/resources/log/Lucene.xml deleted file mode 100644 index b53961d4..00000000 --- a/wcs/nladmin-system/src/main/resources/log/Lucene.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - ${LOG_HOME}/lucene/${DEVICECODE}/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 2GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - ${log.charset} - - - - - - - - - - - diff --git a/wcs/nladmin-system/src/main/resources/log/MesToAcs.xml b/wcs/nladmin-system/src/main/resources/log/MesToAcs.xml index f26a6ef7..34b87001 100644 --- a/wcs/nladmin-system/src/main/resources/log/MesToAcs.xml +++ b/wcs/nladmin-system/src/main/resources/log/MesToAcs.xml @@ -22,12 +22,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml b/wcs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml index 1b118689..dc91d41f 100644 --- a/wcs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml +++ b/wcs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml @@ -22,12 +22,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml b/wcs/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml index 2c61abcd..96d7184b 100644 --- a/wcs/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml +++ b/wcs/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml @@ -22,12 +22,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml b/wcs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml index 3eda4aa7..62b76540 100644 --- a/wcs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml +++ b/wcs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml @@ -22,12 +22,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/log/OpcUtil.xml b/wcs/nladmin-system/src/main/resources/log/OpcUtil.xml index 2db94289..a4b64321 100644 --- a/wcs/nladmin-system/src/main/resources/log/OpcUtil.xml +++ b/wcs/nladmin-system/src/main/resources/log/OpcUtil.xml @@ -22,12 +22,18 @@ + + 100 + 500 + + + - + diff --git a/wcs/nladmin-system/src/main/resources/logback-spring.xml b/wcs/nladmin-system/src/main/resources/logback-spring.xml index 8ef9376b..7dbdf7af 100644 --- a/wcs/nladmin-system/src/main/resources/logback-spring.xml +++ b/wcs/nladmin-system/src/main/resources/logback-spring.xml @@ -20,7 +20,6 @@ https://juejin.cn/post/6844903775631572999 - @@ -62,13 +61,13 @@ https://juejin.cn/post/6844903775631572999 - 0 + 100 500 - + 1000 ${LOKI_URL}/push @@ -86,6 +85,14 @@ https://juejin.cn/post/6844903775631572999 + + 0 + 500 + + + + + error @@ -111,21 +118,17 @@ https://juejin.cn/post/6844903775631572999 - - - - @@ -165,20 +168,16 @@ https://juejin.cn/post/6844903775631572999 - - - -