opt:日志优化

mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java

@@ -46,16 +46,14 @@ public class DruidFilter extends FilterEventAdapter {
         try {
             count=statement.getUpdateCount();
         }catch (Exception ex){ }
-        if (StringUtils.isNotEmpty(traceId) && count>0) {
+        if (true) {
-            if (size > 0) {
+            Collection<JdbcParameter> values = statement.getParameters().values();
-                Collection<JdbcParameter> values = statement.getParameters().values();
+            List<Object> params = new ArrayList<>();
-                List<Object> params = new ArrayList<>();
+            for (JdbcParameter value : values) {
-                for (JdbcParameter value : values) {
+                params.add(value.getValue());
-                    params.add(value.getValue());
-                }
-                executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params);
             }
-            log.info("[----SQL----][update][ SQL: {} ]", executeSql);
+            executeSql = SQLUtils.format(executeSql, JdbcUtils.MYSQL, params);
+            log.info("[----SQL----][update][执行结果:{}][ SQL: {} ]",count,executeSql);
         }
         super.statementExecuteAfter(statement, sql, result);
     }

mes/hd/nladmin-system/src/main/java/org/nl/config/lucene/LuceneAppender.java

@@ -71,6 +71,7 @@ public class LuceneAppender extends AppenderBase<ILoggingEvent> {
         }else {
             doc.add(new StringField("traceId"," ", Field.Store.YES));
         }
+        doc.add(new StringField(LogMessageConstant.FIELD_CLASS_NAME, event.getLoggerName(), 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()));

mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java

@@ -147,7 +147,7 @@ public class EsLogServiceImpl implements EsLogService {
             IndexWriter indexWriter = LuceneAppender.indexWriter;
             if (indexWriter != null){
                 BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder();
-                DateTime offset = DateUtil.offset(new Date(), DateField.HOUR_OF_DAY, 1);
+                DateTime offset = DateUtil.offset(new Date(), DateField.HOUR_OF_DAY, -7);
                 TermRangeQuery termRangeQuery = new TermRangeQuery(
                         "requestTime",null,
                         new BytesRef(DateUtil.format(offset, "yyyy-MM-dd HH:mm:ss.SSS")), true, true);

mes/hd/nladmin-system/src/main/resources/logback-spring.xml

@@ -96,45 +96,60 @@ s    <!-- 按照每天生成日志文件 -->
             <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="CONSOLE"/>
         </root>
-    </springProfile>
+        <logger name="jdbc" level="ERROR" additivity="true">
-
+            <appender-ref ref="asyncFileAppender"/>
-    <!--生产环境:打印控制台和输出到文件-->
+        </logger>
-    <springProfile name="prod">
-        <root level="info">
-            <appender-ref ref="asyncLuceneAppender"/>
-            <appender-ref ref="CONSOLE"/>
-        </root>
         <logger name="org.springframework" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="org.hibernate" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="io.netty" level="ERROR" additivity="true">
-            <appender-ref ref="asyncFileAppender"/>
-        </logger>
-        <logger name="jdbc" level="ERROR" additivity="true">
-            <appender-ref ref="asyncFileAppender"/>
-        </logger>
-        <logger name="io.lettuce" level="ERROR" additivity="true">
-            <appender-ref ref="asyncFileAppender"/>
-        </logger>
-        <logger name="com.fasterxml" level="ERROR" additivity="true">
-            <appender-ref ref="asyncFileAppender"/>
-        </logger>
         <logger name="org.quartz" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
         <logger name="com.google" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="springfox" level="ERROR" additivity="true">
+        <logger name="org.redisson" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="log4jdbc" level="ERROR" additivity="true">
+        <logger name="org.nl.wql" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="nl.basjes" level="ERROR" additivity="true">
+        <logger name="org.springframework.data" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+    </springProfile>
+
+    <!--生产环境:打印控制台和输出到文件-->
+    <springProfile name="prod">
+        <root level="info">
+            <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="CONSOLE"/>
+        </root>
+        <logger name="jdbc" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.hibernate" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.quartz" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="com.google" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.redisson" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.nl.wql" level="ERROR" additivity="true">
+            <appender-ref ref="asyncFileAppender"/>
+        </logger>
+        <logger name="org.springframework.data" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
     </springProfile>

mes/qd/src/views/tools/es/view/index.vue

@@ -148,6 +148,7 @@
               <span style="color: #6c0a99;font-weight: 700">{{ log.system }}</span>
               <span style="color: #13ce66">{{ log.thread }}</span>
               <span :style="fontType(log.logLevel)">{{ log.logLevel }}</span>
+              <span>{{ log.logger }}</span>
               <span>{{ log.requestIp }}</span>
               <span style="color: #7c8db0">{{ log.requestTime }}</span>
               <span style="color: chocolate">{{ log.traceId }}</span>