diff --git a/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java b/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java index 24e1c6870..5bef6ecf0 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java @@ -70,7 +70,7 @@ public class DataScopeInterceptor extends JsqlParserSupport implements InnerInte StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); for (StackTraceElement e : stackTrace) { if (e.getClassName().startsWith("com.zhgd") && notInPackage(e.getClassName()) && !e.getClassName().contains("$$")) { - sb.append(e.getClassName()); + sb.append(StrUtil.subAfter(e.getClassName(),".",true)); sb.append("."); sb.append(e.getMethodName()); sb.append("("); @@ -78,7 +78,7 @@ public class DataScopeInterceptor extends JsqlParserSupport implements InnerInte sb.append(".java:"); sb.append(e.getLineNumber()); sb.append(")"); - sb.append("\r\n"); + sb.append(" > "); } } return sb.toString(); @@ -117,13 +117,13 @@ public class DataScopeInterceptor extends JsqlParserSupport implements InnerInte if (EnvironmentUtil.getActiveEnvironment().equals("gsx-other-env-show-dev")) { //开发环境 if (sct == SqlCommandType.SELECT) { - log.debug("查询mapper方法:\r\n {} >>> {}#{}", getCallPositionForDev(), clazz.getName(), methodName); + log.debug("查询mapper: {} {}#{}", getCallPositionForDev(), clazz.getName(), methodName); } else if (sct == SqlCommandType.UPDATE) { - log.debug("更新mapper方法:\r\n {} >>> {}#{}", getCallPositionForDev(), clazz.getName(), methodName); + log.debug("更新mapper: {} {}#{}", getCallPositionForDev(), clazz.getName(), methodName); } else if (sct == SqlCommandType.INSERT) { - log.debug("插入mapper方法:\r\n {} >>> {}#{}", getCallPositionForDev(), clazz.getName(), methodName); + log.debug("插入mapper: {} {}#{}", getCallPositionForDev(), clazz.getName(), methodName); } else if (sct == SqlCommandType.DELETE) { - log.debug("删除mapper方法:\r\n {} >>> {}#{}", getCallPositionForDev(), clazz.getName(), methodName); + log.debug("删除mapper: {} {}#{}", getCallPositionForDev(), clazz.getName(), methodName); } } else { if (sct == SqlCommandType.SELECT) { diff --git a/src/main/java/com/zhgd/xmgl/util/RequestIdUtil.java b/src/main/java/com/zhgd/xmgl/util/RequestIdUtil.java index 676505ff4..7a39b7c81 100644 --- a/src/main/java/com/zhgd/xmgl/util/RequestIdUtil.java +++ b/src/main/java/com/zhgd/xmgl/util/RequestIdUtil.java @@ -7,7 +7,7 @@ public class RequestIdUtil { public static final String REQUEST_ID = "requestId"; public static void setRequestId() { - MDC.put(REQUEST_ID, IdUtil.fastSimpleUUID()); + MDC.put(REQUEST_ID, getRandomStr()); } public static String getRequestId() { @@ -15,7 +15,11 @@ public class RequestIdUtil { } public static void setRequestId(String s) { - MDC.put(REQUEST_ID, IdUtil.fastSimpleUUID() + s); + MDC.put(REQUEST_ID, getRandomStr() + s); + } + + private static String getRandomStr() { + return IdUtil.fastSimpleUUID().substring(0, 5); } public static void clear() { diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index b7a81e428..735b58e04 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -1,12 +1,12 @@ - + - %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{requestId}] [%thread] %highlight(%-5level) %method:%L %cyan(%logger{50}) - %highlight(%msg) %n + %d{yyyy-MM-dd HH:mm:ss} [%X{requestId}][%thread] %highlight(%-5level) %method:%L %cyan(%logger{50}) - %highlight(%msg) %n @@ -16,7 +16,7 @@ ${log.path}/zhgd-debug.log - %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{requestId}] [%thread] %-5level %logger{50} - %msg%n + %d{yyyy-MM-dd HH:mm:ss} [%X{requestId}] [%thread] %-5level %logger{50} - %msg%n UTF-8 @@ -43,7 +43,7 @@ ${log.path}/zhgd-info.log - %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{requestId}] [%thread] %-5level %logger{56}.%method:%L - %msg%n + %d{yyyy-MM-dd HH:mm:ss} [%X{requestId}] [%thread] %-5level %logger{56}.%method:%L - %msg%n UTF-8 @@ -69,7 +69,7 @@ ${log.path}/zhgd-error.log - %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{requestId}] [%thread] %-5level %logger{50} - %msg%n + %d{yyyy-MM-dd HH:mm:ss} [%X{requestId}] [%thread] %-5level %logger{50} - %msg%n UTF-8 @@ -95,7 +95,7 @@ ${log.path}/zhgd-all.log - %d{yyyy-MM-dd HH:mm:ss.SSS} [%X{requestId}] [%thread] %highlight(%-5level) %method:%L %cyan(%logger{50}) - %highlight(%msg) %n + %d{yyyy-MM-dd HH:mm:ss} [%X{requestId}] [%thread] %highlight(%-5level) %method:%L %cyan(%logger{50}) - %highlight(%msg) %n UTF-8