From d56efb26218fef2bf450704902bdcc89a3816b54 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Wed, 1 Mar 2023 10:14:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/modules/system/service/impl/EsLogServiceImpl.java  | 8 ++++++--
 .../src/main/resources/config/application-dev.yml         | 2 +-
 .../nladmin-system/src/main/resources/logback-spring.xml  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

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 00009282..617c2cd9 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
@@ -47,7 +47,7 @@ public class EsLogServiceImpl implements EsLogService {
         PageResult page = new PageResult();
         if (logQuery != null){
             BoolQueryBuilder query = QueryBuilders.boolQuery(); //requestMethod
-            extractedQueryParam(logQuery, query);
+            extractedParam(logQuery, query);
             Iterable<LogRepositoryDTO> all = esLogRepository.search(query, PageRequest.of(logQuery.getPage()-1,logQuery.getSize(), Sort.by("@timestamp").descending()));
             page.addAll(((AggregatedPageImpl) all).getContent());
             page.setTotal((int) ((AggregatedPageImpl) all).getTotalElements());
@@ -61,8 +61,12 @@ public class EsLogServiceImpl implements EsLogService {
 
     @Override
     public void clearLogs(LogQuery logQuery) {
+        String system = logQuery.getSystem();
+        if (StringUtils.isEmpty(system)){
+            return;
+        }
         BoolQueryBuilder query = QueryBuilders.boolQuery();
-        extractedParam(logQuery, query);
+        query.must().add(QueryBuilders.matchQuery("system", system));
         DeleteQuery deleteQuery = new DeleteQuery();
         deleteQuery.setQuery(query);
         elasticsearchRestTemplate.delete(deleteQuery,new LogRepositoryDTO().getClass());
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 d2782320..bd98628e 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
@@ -38,7 +38,7 @@ spring:
 #      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
-      password: ${DB_PWD:password}
+      password: ${DB_PWD:942464Yy}
 #      username: ${DB_USER:root}
 #      password: ${DB_PWD:root}
       # 初始连接数
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 35be6b15..29b82eb0 100644
--- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -119,7 +119,7 @@ https://juejin.cn/post/6844903775631572999
 
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <root level="ERROR">
+        <root level="info">
             <appender-ref ref="esLogAppender"/>
             <appender-ref ref="CONSOLE"/>
         </root>