1

lms/nladmin-system/src/main/java/org/nl/common/utils/BaseCode.java

@@ -0,0 +1,33 @@
+package org.nl.common.utils;
+
+/*
+ * @author ZZQ
+ * @Date 2023/2/9 2:54 下午
+ */
+public class BaseCode {
+
+    static final char[] MySerials =  new char[]{
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+            'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
+            'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p','q','r','s','t','u','v','w','x','y','z',
+            'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+            'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P','Q','R','S','T','U','V','W','X','Y','Z'};
+
+
+    public static final String intToChars(long n){
+        String s = "";
+        if (n == 0) {
+            s = "0";
+        }
+        while (n != 0) {
+            int i = (int) (n % MySerials.length);
+            char c = MySerials[i];
+            s = c + s;
+            n = n / MySerials.length;
+        }
+        for (int x = s.length();x<5;x++){
+            s="0"+s;
+        }
+        return s;
+    }
+}

lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java

@@ -27,6 +27,7 @@ import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.nl.common.utils.BaseCode;
 import org.nl.common.utils.IdUtil;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.utils.RequestHolder;
@@ -67,7 +68,7 @@ public class LogAspect {
      */
     @Around("@annotation(logInfo)")
     public Object logAround(ProceedingJoinPoint joinPoint,org.nl.modules.logging.annotation.Log logInfo) throws Throwable {
-        String trackId = UUID.randomUUID().toString();
+
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
         String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
@@ -77,7 +78,7 @@ public class LogAspect {
 
         MDC.put("requestMethod",methodName);
         MDC.put("requestIp", StringUtils.getIp(request));
-        MDC.put("trackId", UUID.randomUUID().toString());
+        MDC.put("traceId", BaseCode.intToChars(IdUtil.getLongId()));
         MDC.put("requestTime", DateUtil.now());
 
         Object result = null;
@@ -109,20 +110,19 @@ public class LogAspect {
                     json.put("create_time", DateUtil.now());
                     Object parse = JSONObject.parse(result.toString());
                     json.put("return_result", parse);
-                    log.info("请求结果:{}",parse);
                     interfaceLog.insert(json);
                 } catch (Exception e) {
 
                 }
             }
         }catch (Exception ex){
-            log.info("[--requestError--][请求方法:{}]【异常信息 :{}】", methodName, ex);
+            log.error("[--requestError--][请求方法:{}][请求参数:{}]【异常信息 :{}】", methodName,params, ex);
             Log log = new Log("ERROR", System.currentTimeMillis() - comming);
             log.setExceptionDetail(ThrowableUtil.getStackTrace(ex).getBytes());
             logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log);
             throw  ex;
         }finally {
-            log.info("[--response--][请求方法:{}][请求参数:{}]【返回结果 :{}】",methodName,params,result);
+            log.info("[--response--][请求方法:{}][请求参数:{}],请求执行结束",methodName,params);
             MDC.clear();
         }
         return result;
@@ -165,4 +165,7 @@ public class LogAspect {
             return "";
         }
     }
+
+
+
 }

lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java

@@ -18,7 +18,7 @@ public class LogQuery {
     /**
      * 追踪id
      */
-    private String trackId;
+    private String traceId;
     /**
      * 日志内容模糊匹配
      */

lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java

@@ -20,8 +20,9 @@ public class LogRepositoryDTO {
     private String requestIp;
     @Id
     private String id;
-    private String trackId;
+    private String traceId;
     private String requestMethod;
     private String thread;
+    private String system;
 
 }

lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java

@@ -63,8 +63,8 @@ public class EsLogServiceImpl implements EsLogService {
         if (logQuery.getFilterSql()){
             query.mustNot().add(QueryBuilders.wildcardQuery("logger","org.nl.modules.wql.core.engine.*"));
         }
-        if (StringUtils.isNotEmpty(logQuery.getTrackId())){
+        if (StringUtils.isNotEmpty(logQuery.getTraceId())){
-            query.must().add(QueryBuilders.matchQuery("trackId", logQuery.getTrackId()));
+            query.must().add(QueryBuilders.matchQuery("traceId", logQuery.getTraceId()));
         }
         if (StringUtils.isNotEmpty(logQuery.getMessage())){
             query.must().add(QueryBuilders.matchQuery("message", logQuery.getMessage()).minimumShouldMatch("50%"));

lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java

@@ -54,10 +54,10 @@ public class AutoCreateTask {
                 }
             } catch (InvocationTargetException e) {
                 e.printStackTrace();
-                log.info("定时器执行失败:{}", e.getTargetException().getMessage());
+                log.error("定时器执行失败:{}", e.getTargetException().getMessage());
             } catch (Exception e) {
                 e.printStackTrace();
-                log.info("定时器执行失败:{}", e.getMessage());
+                log.error("定时器执行失败:{}", e.getMessage());
             }
 
         });

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

@@ -68,8 +68,12 @@ https://juejin.cn/post/6844903775631572999
         <!--        <authentication class="com.internetitem.logback.elasticsearch.config.BasicAuthentication" /> &lt;!&ndash; optional &ndash;&gt;-->
         <properties>
             <property>
-                <name>trackId</name>
+                <name>system</name>
-                <value>%X{trackId}</value>
+                <value>lms</value>
+            </property>
+            <property>
+                <name>traceId</name>
+                <value>%X{traceId}</value>
             </property>
             <property>
                 <name>logLevel</name>
@@ -133,7 +137,7 @@ https://juejin.cn/post/6844903775631572999
 
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <root level="debug">
+        <root level="info">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="esLogAppender" />
@@ -141,6 +145,10 @@ https://juejin.cn/post/6844903775631572999
         <logger name="org.springframework" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>
+        <logger name="es-logger" level="warn" additivity="false">
+            <appender-ref ref="esLogAppender" />
+            <appender-ref ref="CONSOLE"/>
+        </logger>
         <logger name="org.apache" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
         </logger>