From 71ce38dc3718bc50c4418bb7b4266ffd6a833fad Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 28 Aug 2025 11:44:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20accesslog=20?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=AE=BF=E9=97=AE=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1496262673661952]accesslog 补充访问用户 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1496262673661952 --- .../restful/dispatch/handler/AnonymousApiDispatcher.java | 1 + .../framework/restful/dispatch/handler/ApiDispatcher.java | 1 + .../framework/restful/dispatch/handler/PublicApiDispatcher.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java index b96fe0f87..a520a6c6a 100644 --- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java +++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java @@ -81,6 +81,7 @@ public class AnonymousApiDispatcher { private ApiAccessCountService apiAccessCountService; private void doIt(HttpServletRequest request, HttpServletResponse response, String token, boolean tokenHasEncrypted, ApiType apiType, JSONObject paramObj, JSONObject returnObj, String action) throws Exception { + request.setAttribute("userId", UserContext.get().getUserId()); InputFrom inputFrom = null; String source = request.getHeader("source"); if (StringUtils.isNotBlank(source)) { diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java index a09a0aa0b..6e75de717 100644 --- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java +++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java @@ -98,6 +98,7 @@ public class ApiDispatcher { private void doIt(HttpServletRequest request, HttpServletResponse response, String token, ApiType apiType, JSONObject paramObj, JSONObject returnObj, String action) throws Exception { + request.setAttribute("userId", UserContext.get().getUserId()); InputFrom inputFrom = null; String source = request.getHeader("source"); if (StringUtils.isNotBlank(source)) { diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java index 306a37714..bbf09d310 100644 --- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java +++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java @@ -48,7 +48,6 @@ import neatlogic.framework.restful.enums.ApiType; import neatlogic.framework.restful.ratelimiter.RateLimiterTokenBucket; import neatlogic.framework.service.AuthenticationInfoService; import neatlogic.module.framework.restful.counter.ApiAccessCountService; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; @@ -91,6 +90,7 @@ public class PublicApiDispatcher { private void doIt(HttpServletRequest request, HttpServletResponse response, String token, ApiType apiType, JSONObject paramObj, JSONObject returnObj, String action) throws Exception { + request.setAttribute("userId", UserContext.get().getUserId()); InputFrom inputFrom = null; String source = request.getHeader("source"); if (StringUtils.isNotBlank(source)) { -- Gitee From 029571af44cc3c23c0f36e8cca4b4830c3612be5 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 28 Aug 2025 11:52:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20accesslog=20?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=AE=BF=E9=97=AE=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1496262673661952]accesslog 补充访问用户 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1496262673661952 --- .../restful/dispatch/handler/AnonymousApiDispatcher.java | 6 +++++- .../framework/restful/dispatch/handler/ApiDispatcher.java | 6 +++++- .../restful/dispatch/handler/PublicApiDispatcher.java | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java index a520a6c6a..984d1cef0 100644 --- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java +++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java @@ -81,7 +81,11 @@ public class AnonymousApiDispatcher { private ApiAccessCountService apiAccessCountService; private void doIt(HttpServletRequest request, HttpServletResponse response, String token, boolean tokenHasEncrypted, ApiType apiType, JSONObject paramObj, JSONObject returnObj, String action) throws Exception { - request.setAttribute("userId", UserContext.get().getUserId()); + UserContext userContext = UserContext.get(); + if (userContext != null) { + request.setAttribute("userId", userContext.getUserId()); + request.setAttribute("userName", userContext.getUserName()); + } InputFrom inputFrom = null; String source = request.getHeader("source"); if (StringUtils.isNotBlank(source)) { diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java index 6e75de717..5b5358e0f 100644 --- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java +++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java @@ -98,7 +98,11 @@ public class ApiDispatcher { private void doIt(HttpServletRequest request, HttpServletResponse response, String token, ApiType apiType, JSONObject paramObj, JSONObject returnObj, String action) throws Exception { - request.setAttribute("userId", UserContext.get().getUserId()); + UserContext userContext = UserContext.get(); + if (userContext != null) { + request.setAttribute("userId", userContext.getUserId()); + request.setAttribute("userName", userContext.getUserName()); + } InputFrom inputFrom = null; String source = request.getHeader("source"); if (StringUtils.isNotBlank(source)) { diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java index bbf09d310..0abbdd414 100644 --- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java +++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/PublicApiDispatcher.java @@ -90,7 +90,11 @@ public class PublicApiDispatcher { private void doIt(HttpServletRequest request, HttpServletResponse response, String token, ApiType apiType, JSONObject paramObj, JSONObject returnObj, String action) throws Exception { - request.setAttribute("userId", UserContext.get().getUserId()); + UserContext userContext = UserContext.get(); + if (userContext != null) { + request.setAttribute("userId", userContext.getUserId()); + request.setAttribute("userName", userContext.getUserName()); + } InputFrom inputFrom = null; String source = request.getHeader("source"); if (StringUtils.isNotBlank(source)) { -- Gitee From 4dafeacbd33e4ba0c4d34b98a4ec52178dbce5fb Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 29 Aug 2025 11:48:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20accesslog=20?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E8=AE=BF=E9=97=AE=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1496262673661952]accesslog 补充访问用户 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1496262673661952 --- .../framework/asynchronization/threadlocal/UserContext.java | 4 ++++ .../framework/logback/converter/TenantConverter.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/neatlogic/framework/asynchronization/threadlocal/UserContext.java b/src/main/java/neatlogic/framework/asynchronization/threadlocal/UserContext.java index 263a5dee1..b4af079ce 100644 --- a/src/main/java/neatlogic/framework/asynchronization/threadlocal/UserContext.java +++ b/src/main/java/neatlogic/framework/asynchronization/threadlocal/UserContext.java @@ -27,6 +27,7 @@ import neatlogic.framework.exception.user.NoUserException; import neatlogic.framework.filter.core.LoginAuthHandlerBase; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.slf4j.MDC; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -80,6 +81,7 @@ public class UserContext implements Serializable { context = _userContext.copy(); } instance.set(context); + MDC.put("userId", context.getUserId()); return context; } @@ -102,6 +104,7 @@ public class UserContext implements Serializable { } context.setAuthenticationInfoVo(new AuthenticationInfoVo(context.getUserUuid(), new ArrayList<>(), roleUuidList, new HashSet<>(), null)); instance.set(context); + MDC.put("userId", context.getUserId()); return context; } @@ -130,6 +133,7 @@ public class UserContext implements Serializable { } context.setJwtVo(userVo.getJwtVo()); instance.set(context); + MDC.put("userId", context.getUserId()); return context; } diff --git a/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java b/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java index c0efe54bd..482352485 100644 --- a/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java +++ b/src/main/java/neatlogic/framework/logback/converter/TenantConverter.java @@ -40,6 +40,10 @@ public class TenantConverter extends ClassicConverter implements Serializable { Map map = event.getMDCPropertyMap(); String tenant = map.get("tenant"); if (StringUtils.isNotBlank(tenant)) { + String userId = map.get("userId"); + if (StringUtils.isNotBlank(userId)) { + tenant += "(" + userId + ")"; + } return tenant; } return StringUtils.EMPTY; -- Gitee