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 972c497e..32adb104 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,9 +16,9 @@ package top.charles7c.continew.admin.monitor.config; +import java.net.URI; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.List; import java.util.Map; import lombok.RequiredArgsConstructor; @@ -73,10 +73,11 @@ public class LogDaoLocalImpl implements LogDao { // 请求信息 LogRequest logRequest = logRecord.getRequest(); logDO.setRequestMethod(logRequest.getMethod()); - String requestUri = logRequest.getUri().toString(); - logDO.setRequestUri(requestUri); - Map> requestHeaders = logRequest.getHeaders(); - logDO.setRequestHeaders(JSONUtil.toJsonStr(requestHeaders)); + URI requestUrl = logRequest.getUrl(); + String requestUri = requestUrl.getPath(); + logDO.setRequestUrl(requestUrl.toString()); + Map requestHeaderMap = logRequest.getHeaders(); + logDO.setRequestHeaders(JSONUtil.toJsonStr(requestHeaderMap)); String requestBody = logRequest.getBody(); logDO.setRequestBody(requestBody); logDO.setIp(logRequest.getIp()); @@ -109,9 +110,9 @@ public class LogDaoLocalImpl implements LogDao { } } // 操作人 - if (!requestUri.startsWith(SysConstants.LOGOUT_URI) && MapUtil.isNotEmpty(requestHeaders) - && requestHeaders.containsKey(HttpHeaders.AUTHORIZATION)) { - String authorization = requestHeaders.get(HttpHeaders.AUTHORIZATION).get(0); + if (!requestUri.startsWith(SysConstants.LOGOUT_URI) && MapUtil.isNotEmpty(requestHeaderMap) + && requestHeaderMap.containsKey(HttpHeaders.AUTHORIZATION)) { + String authorization = requestHeaderMap.get(HttpHeaders.AUTHORIZATION); String token = authorization.replace(SaManager.getConfig().getTokenPrefix() + StringConstants.SPACE, StringConstants.EMPTY); logDO.setCreateUser(Convert.toLong(StpUtil.getLoginIdByToken(token))); diff --git a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/entity/LogDO.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/entity/LogDO.java index a93c5811..8d911869 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/entity/LogDO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/entity/LogDO.java @@ -57,9 +57,9 @@ public class LogDO implements Serializable { private String module; /** - * 请求 URI + * 请求 URL */ - private String requestUri; + private String requestUrl; /** * 请求方式 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 38bd96a6..21bb239c 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 @@ -48,10 +48,10 @@ public class SystemLogDetailResp extends LogResp { private String requestMethod; /** - * 请求 URI + * 请求 URL */ - @Schema(description = "请求 URI", example = "/system/dept") - private String requestUri; + @Schema(description = "请求 URL", example = "https://api.charles7c.top/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 d4c5dce2..38877ffd 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 @@ -48,10 +48,10 @@ public class SystemLogResp extends LogResp { private String requestMethod; /** - * 请求 URI + * 请求 URL */ - @Schema(description = "请求 URI", example = "/system/dept") - private String requestUri; + @Schema(description = "请求 URL", example = "https://api.charles7c.top/system/dept") + private String requestUrl; /** * IP diff --git a/continew-admin-ui/src/api/monitor/log.ts b/continew-admin-ui/src/api/monitor/log.ts index 80e710cd..2a499d9b 100644 --- a/continew-admin-ui/src/api/monitor/log.ts +++ b/continew-admin-ui/src/api/monitor/log.ts @@ -30,7 +30,7 @@ export interface OperationLogRecord extends LogRecord { export interface SystemLogRecord extends LogRecord { statusCode: number; requestMethod: string; - requestUri: string; + requestUrl: string; timeTaken: number; } 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 81a4ce49..90f8e80a 100644 --- a/continew-admin-ui/src/views/monitor/log/system/index.vue +++ b/continew-admin-ui/src/views/monitor/log/system/index.vue @@ -67,8 +67,10 @@ /> @@ -187,11 +189,11 @@ {{ systemLog.requestMethod }} - + - {{ systemLog.requestUri }} + {{ systemLog.requestUrl }} @@ -271,7 +273,7 @@ const systemLogList = ref([]); const systemLog = ref({ - requestUri: '', + requestUrl: '', requestMethod: '', requestHeaders: '', requestBody: '', diff --git a/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql b/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql index 2ab268fe..1c7d70f0 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql +++ b/continew-admin-webapi/src/main/resources/db/changelog/v1.0.0/continew-admin_table.sql @@ -116,7 +116,7 @@ CREATE TABLE IF NOT EXISTS `sys_log` ( `id` bigint(20) AUTO_INCREMENT COMMENT 'ID', `description` varchar(255) NOT NULL COMMENT '日志描述', `module` varchar(50) NOT NULL COMMENT '所属模块', - `request_uri` varchar(512) NOT NULL COMMENT '请求URI', + `request_url` varchar(512) NOT NULL COMMENT '请求URL', `request_method` varchar(10) NOT NULL COMMENT '请求方式', `request_headers` text DEFAULT NULL COMMENT '请求头', `request_body` text DEFAULT NULL COMMENT '请求体',