From fd0e05f95a1146fd2e080094f63c7bb2b494f0dc Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 22 Dec 2023 21:58:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.简化记录 request_url
2.优化记录操作人信息
---
 .../admin/monitor/config/LogDaoLocalImpl.java | 19 ++++++++++++-------
 .../model/resp/SystemLogDetailResp.java       |  2 +-
 .../monitor/model/resp/SystemLogResp.java     |  2 +-
 .../src/views/monitor/log/system/index.vue    |  4 +---
 4 files changed, 15 insertions(+), 12 deletions(-)

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<String, List<String>> 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 @@
           <a-table-column title="请求 URI">
             <template #cell="{ record }">
               <span :title="decodeURIComponent(record.requestUrl)">{{
-                record.requestUrl.match(
-                  /(\w+):\/\/([^/:]+)(:\d*)?([^#|\?|\n]*)(\?.*)?/,
-                )[4]
+                record.requestUrl.match(/([^#|\?|\n]*)(\?.*)?/)[1]
               }}</span>
             </template>
           </a-table-column>