From c4cf28c9c1adec6d6f95bc64a32f962701a8d6e7 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Thu, 9 Feb 2023 15:00:24 +0800 Subject: [PATCH] 1 --- .../java/org/nl/common/utils/BaseCode.java | 33 +++++++++++++++++++ .../nl/modules/logging/aspect/LogAspect.java | 13 +++++--- .../modules/logging/service/dto/LogQuery.java | 2 +- .../logging/service/dto/LogRepositoryDTO.java | 3 +- .../service/impl/EsLogServiceImpl.java | 4 +-- .../org/nl/wms/sch/manage/AutoCreateTask.java | 4 +-- .../src/main/resources/logback-spring.xml | 14 ++++++-- 7 files changed, 59 insertions(+), 14 deletions(-) create mode 100644 lms/nladmin-system/src/main/java/org/nl/common/utils/BaseCode.java diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/BaseCode.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/BaseCode.java new file mode 100644 index 000000000..ab729b4d1 --- /dev/null +++ b/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; + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java index 20ccdc4d2..76053b8cd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java +++ b/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 ""; } } + + + } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java index ee943970b..9523a2480 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java +++ b/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; /** * 日志内容模糊匹配 */ diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java index cbd0276af..63317ba91 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogRepositoryDTO.java +++ b/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; } diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java index 991e68baa..d8a10dcdb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java +++ b/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())){ - query.must().add(QueryBuilders.matchQuery("trackId", logQuery.getTrackId())); + if (StringUtils.isNotEmpty(logQuery.getTraceId())){ + query.must().add(QueryBuilders.matchQuery("traceId", logQuery.getTraceId())); } if (StringUtils.isNotEmpty(logQuery.getMessage())){ query.must().add(QueryBuilders.matchQuery("message", logQuery.getMessage()).minimumShouldMatch("50%")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java index c5010c375..9c6569814 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java +++ b/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()); } }); diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index 21f47505d..075f0ab5c 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -68,8 +68,12 @@ https://juejin.cn/post/6844903775631572999 - trackId - %X{trackId} + system + lms + + + traceId + %X{traceId} logLevel @@ -133,7 +137,7 @@ https://juejin.cn/post/6844903775631572999 - + @@ -141,6 +145,10 @@ https://juejin.cn/post/6844903775631572999 + + + +