ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-10-31 10:57:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert: 回退 ContiNew Starter 部分日志调整

Browse Source 
经过反复思虑，request_uri => request_url
This commit is contained in:
Charles7c
2023-12-25 21:50:24 +08:00
parent 45bd3e10b6
commit 26f3167311
7 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/LogDaoLocalImpl.java
View File

@@ -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)));

4
continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/entity/LogDO.java
View File

@@ -57,9 +57,9 @@ public class LogDO implements Serializable {
private String module;
/**
* 请求 URI
* 请求 URL
*/
private String requestUri;
private String requestUrl;
/**
* 请求方式

6
continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogDetailResp.java
View File

@@ -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;
/**
* 请求头

6
continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogResp.java
View File

@@ -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