diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java index 915cf905..f09f711c 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java @@ -16,6 +16,7 @@ package top.charles7c.continew.admin.monitor.config; +import java.net.URI; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.List; @@ -73,7 +74,11 @@ public class LogDaoLocalImpl implements LogDao { // 请求信息 LogRequest logRequest = logRecord.getRequest(); logDO.setRequestMethod(logRequest.getMethod()); - String requestUrl = logRequest.getUri().toString(); + // 仅记录:/xxx?xx=xx&xx=xx + URI requestUri = logRequest.getUri(); + String requestQuery = requestUri.getQuery(); + String requestUrl = StrUtil.isNotBlank(requestQuery) + ? requestUri.getPath() + StringConstants.QUESTION_MARK + requestQuery : requestUri.getPath(); logDO.setRequestUrl(requestUrl); Map> requestHeaders = logRequest.getHeaders(); logDO.setRequestHeaders(JSONUtil.toJsonStr(requestHeaders)); @@ -99,17 +104,17 @@ public class LogDaoLocalImpl implements LogDao { logDO.setErrorMsg(result.getMsg()); } // 操作人 - if (StrUtil.contains(requestUrl, SysConstants.LOGOUT_URI)) { + if (requestUrl.startsWith(SysConstants.LOGOUT_URI)) { Long loginId = Convert.toLong(result.getData(), -1L); logDO.setCreateUser(-1 != loginId ? loginId : null); + } else if (result.isSuccess() && requestUrl.startsWith(SysConstants.LOGIN_URI)) { + AccountLoginReq loginReq = JSONUtil.toBean(requestBody, AccountLoginReq.class); + logDO.setCreateUser( + ExceptionUtils.exToNull(() -> userService.getByUsername(loginReq.getUsername()).getId())); } } // 操作人 - if (StrUtil.contains(requestUrl, SysConstants.LOGIN_URI)) { - AccountLoginReq loginReq = JSONUtil.toBean(requestBody, AccountLoginReq.class); - logDO.setCreateUser( - ExceptionUtils.exToNull(() -> userService.getByUsername(loginReq.getUsername()).getId())); - } else if (!StrUtil.contains(requestUrl, SysConstants.LOGOUT_URI) && MapUtil.isNotEmpty(requestHeaders) + if (!requestUrl.startsWith(SysConstants.LOGOUT_URI) && MapUtil.isNotEmpty(requestHeaders) && requestHeaders.containsKey(HttpHeaders.AUTHORIZATION)) { String authorization = requestHeaders.get(HttpHeaders.AUTHORIZATION).get(0); String token = authorization.replace(SaManager.getConfig().getTokenPrefix() + StringConstants.SPACE, diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogDetailResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogDetailResp.java index 05160e26..ca89a678 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogDetailResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogDetailResp.java @@ -50,7 +50,7 @@ public class SystemLogDetailResp extends LogResp { /** * 请求 URL */ - @Schema(description = "请求 URL", example = "http://api.charles7c.top/system/dept") + @Schema(description = "请求 URL", example = "/system/dept") private String requestUrl; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogResp.java index c0046436..949a7790 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogResp.java @@ -50,7 +50,7 @@ public class SystemLogResp extends LogResp { /** * 请求 URL */ - @Schema(description = "请求 URL", example = "http://api.charles7c.top/system/dept") + @Schema(description = "请求 URL", example = "/system/dept") private String requestUrl; /** diff --git a/continew-admin-ui/src/views/monitor/log/system/index.vue b/continew-admin-ui/src/views/monitor/log/system/index.vue index bf042eeb..d1cd1bb2 100644 --- a/continew-admin-ui/src/views/monitor/log/system/index.vue +++ b/continew-admin-ui/src/views/monitor/log/system/index.vue @@ -68,9 +68,7 @@