From e9f01d05c94ad2235c0f784f3cc91ca66201475c Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 25 Dec 2023 19:50:52 +0800 Subject: [PATCH] =?UTF-8?q?revert(log/httptrace-pro):=20=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=20URI=20=3D>=20=E8=AF=B7=E6=B1=82=20URL=EF=BC=8C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=8D=8F=E8=AE=AE=E3=80=81=E5=9F=9F=E5=90=8D=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=88=E4=BF=9D=E6=8C=81=E5=B0=BD=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E6=95=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../starter/log/common/model/LogRequest.java | 6 +++--- .../log/common/model/RecordableHttpRequest.java | 6 +++--- .../log/httptracepro/handler/LogInterceptor.java | 9 +++------ .../handler/RecordableServletHttpRequest.java | 14 ++++++++------ 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRequest.java b/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRequest.java index 91169dde..c9f63e3c 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRequest.java +++ b/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/LogRequest.java @@ -43,9 +43,9 @@ public class LogRequest { private String method; /** - * 请求 URI + * 请求 URL */ - private URI uri; + private URI url; /** * IP @@ -84,7 +84,7 @@ public class LogRequest { public LogRequest(RecordableHttpRequest request, Set includes) { this.method = request.getMethod(); - this.uri = request.getUri(); + this.url = request.getUrl(); this.ip = request.getIp(); this.headers = (includes.contains(Include.REQUEST_HEADERS)) ? request.getHeaders() : null; if (includes.contains(Include.REQUEST_BODY)) { diff --git a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpRequest.java b/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpRequest.java index fca8ee47..f832c286 100644 --- a/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpRequest.java +++ b/continew-starter-log/continew-starter-log-common/src/main/java/top/charles7c/continew/starter/log/common/model/RecordableHttpRequest.java @@ -39,11 +39,11 @@ public interface RecordableHttpRequest { String getMethod(); /** - * 获取 URI + * 获取 URL * - * @return URI + * @return URL */ - URI getUri(); + URI getUrl(); /** * 获取 IP diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java index 11d13b5f..cf09bd1e 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/LogInterceptor.java @@ -31,7 +31,6 @@ import top.charles7c.continew.starter.log.common.annotation.Log; import top.charles7c.continew.starter.log.common.dao.LogDao; import top.charles7c.continew.starter.log.common.enums.Include; import top.charles7c.continew.starter.log.common.model.LogRecord; -import top.charles7c.continew.starter.log.common.model.LogRequest; import top.charles7c.continew.starter.log.common.model.LogResponse; import top.charles7c.continew.starter.log.httptracepro.autoconfigure.LogProperties; @@ -57,11 +56,10 @@ public class LogInterceptor implements HandlerInterceptor { @NonNull Object handler) { Clock timestamp = Clock.systemUTC(); if (this.isRequestRecord(handler)) { - RecordableServletHttpRequest sourceRequest = new RecordableServletHttpRequest(request); if (Boolean.TRUE.equals(properties.getIsPrint())) { - log.info("[{}] {}", sourceRequest.getMethod(), sourceRequest.getUri()); + log.info("[{}] {}", request.getMethod(), request.getRequestURI()); } - LogRecord.Started startedLogRecord = LogRecord.start(timestamp, sourceRequest); + LogRecord.Started startedLogRecord = LogRecord.start(timestamp, new RecordableServletHttpRequest(request)); timestampTtl.set(startedLogRecord); } return true; @@ -88,9 +86,8 @@ public class LogInterceptor implements HandlerInterceptor { this.logModule(finishedLogRecord, handlerMethod); } if (Boolean.TRUE.equals(properties.getIsPrint())) { - LogRequest logRequest = finishedLogRecord.getRequest(); LogResponse logResponse = finishedLogRecord.getResponse(); - log.info("[{}] {} {} {}ms", logRequest.getMethod(), logRequest.getUri(), logResponse.getStatus(), finishedLogRecord.getTimeTaken().toMillis()); + log.info("[{}] {} {} {}ms", request.getMethod(), request.getRequestURI(), logResponse.getStatus(), finishedLogRecord.getTimeTaken().toMillis()); } dao.add(finishedLogRecord); } catch (Exception ex) { diff --git a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java index d3b7c878..1183caf5 100644 --- a/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java +++ b/continew-starter-log/continew-starter-log-httptrace-pro/src/main/java/top/charles7c/continew/starter/log/httptracepro/handler/RecordableServletHttpRequest.java @@ -51,16 +51,18 @@ public final class RecordableServletHttpRequest implements RecordableHttpRequest } @Override - public URI getUri() { + public URI getUrl() { String queryString = request.getQueryString(); if (StrUtil.isBlank(queryString)) { - return URI.create(request.getRequestURI()); + return URI.create(request.getRequestURL().toString()); } try { - return new URI(this.appendQueryString(queryString)); + StringBuffer urlBuffer = this.appendQueryString(queryString); + return new URI(urlBuffer.toString()); } catch (URISyntaxException e) { String encoded = UriUtils.encodeQuery(queryString, StandardCharsets.UTF_8); - return URI.create(this.appendQueryString(encoded)); + StringBuffer urlBuffer = this.appendQueryString(encoded); + return URI.create(urlBuffer.toString()); } } @@ -91,7 +93,7 @@ public final class RecordableServletHttpRequest implements RecordableHttpRequest : Collections.unmodifiableMap(request.getParameterMap()); } - private String appendQueryString(String queryString) { - return request.getRequestURI() + StringConstants.QUESTION_MARK + queryString; + private StringBuffer appendQueryString(String queryString) { + return request.getRequestURL().append(StringConstants.QUESTION_MARK).append(queryString); } } \ No newline at end of file