revert: 回退 ContiNew Starter 部分日志调整
经过反复思虑，request_uri => request_url
This commit is contained in:
Charles7c
parent
45bd3e10b6
commit
26f3167311
@ -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<String, List<String>> requestHeaders = logRequest.getHeaders();
|
||||
logDO.setRequestHeaders(JSONUtil.toJsonStr(requestHeaders));
|
||||
URI requestUrl = logRequest.getUrl();
|
||||
String requestUri = requestUrl.getPath();
|
||||
logDO.setRequestUrl(requestUrl.toString());
|
||||
Map<String, String> 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)));
|
||||
|
||||
@ -57,9 +57,9 @@ public class LogDO implements Serializable {
|
||||
private String module;
|
||||
|
||||
/**
|
||||
* 请求 URI
|
||||
* 请求 URL
|
||||
*/
|
||||
private String requestUri;
|
||||
private String requestUrl;
|
||||
|
||||
/**
|
||||
* 请求方式
|
||||
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
* 请求头
|
||||
|
||||
@ -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
|
||||
|
||||
@ -30,7 +30,7 @@ export interface OperationLogRecord extends LogRecord {
|
||||
export interface SystemLogRecord extends LogRecord {
|
||||
statusCode: number;
|
||||
requestMethod: string;
|
||||
requestUri: string;
|
||||
requestUrl: string;
|
||||
timeTaken: number;
|
||||
}
|
||||
|
||||
|
||||
@ -67,8 +67,10 @@
|
||||
/>
|
||||
<a-table-column title="请求 URI">
|
||||
<template #cell="{ record }">
|
||||
<span :title="decodeURIComponent(record.requestUri)">{{
|
||||
record.requestUri.match(/([^#|\?|\n]*)(\?.*)?/)[1]
|
||||
<span :title="decodeURIComponent(record.requestUrl)">{{
|
||||
record.requestUrl.match(
|
||||
/(\w+):\/\/([^/:]+)(:\d*)?([^#|\?|\n]*)(\?.*)?/,
|
||||
)[4]
|
||||
}}</span>
|
||||
</template>
|
||||
</a-table-column>
|
||||
@ -187,11 +189,11 @@
|
||||
</a-skeleton>
|
||||
<span v-else>{{ systemLog.requestMethod }}</span>
|
||||
</a-descriptions-item>
|
||||
<a-descriptions-item label="请求 URI" :span="2">
|
||||
<a-descriptions-item label="请求 URL" :span="2">
|
||||
<a-skeleton v-if="loading" :animation="true">
|
||||
<a-skeleton-line :rows="1" />
|
||||
</a-skeleton>
|
||||
<span v-else>{{ systemLog.requestUri }}</span>
|
||||
<span v-else>{{ systemLog.requestUrl }}</span>
|
||||
</a-descriptions-item>
|
||||
<a-descriptions-item label="响应体" :span="2">
|
||||
<a-skeleton v-if="loading" :animation="true">
|
||||
@ -271,7 +273,7 @@
|
||||
|
||||
const systemLogList = ref<SystemLogRecord[]>([]);
|
||||
const systemLog = ref<SystemLogDetailRecord>({
|
||||
requestUri: '',
|
||||
requestUrl: '',
|
||||
requestMethod: '',
|
||||
requestHeaders: '',
|
||||
requestBody: '',
|
||||
|
||||
@ -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 '请求体',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user