From 7aa5a9865ed8d6a7f697cafdca36756f54d9c76e Mon Sep 17 00:00:00 2001 From: Bozhu12 <1173930245@qq.com> Date: Fri, 27 Oct 2023 18:50:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=E5=AE=8C=E5=96=84=20,=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AFUI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/helper/LoginHelper.java | 7 +++++++ .../java/com/ruoyi/framework/aspectj/LogAspect.java | 1 + ruoyi-ui/src/views/monitor/operlog/index.vue | 12 +++++++----- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java index b2a863eb9..5e7fad208 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java @@ -126,6 +126,13 @@ public class LoginHelper { return getLoginUser().getUsername(); } + /** + * 获取用户部门名称 + */ + public static String getDeptName() { + return getLoginUser().getDeptName(); + } + /** * 获取用户类型 */ diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 1e0c05285..48e6e9599 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -75,6 +75,7 @@ public class LogAspect { operLog.setOperIp(ip); operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)); operLog.setOperName(LoginHelper.getUsername()); + operLog.setDeptName(LoginHelper.getDeptName()); if (e != null) { operLog.setStatus(BusinessStatus.FAIL.ordinal()); diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue index 03a1ea64f..166386e22 100644 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ b/ruoyi-ui/src/views/monitor/operlog/index.vue @@ -122,6 +122,7 @@ + @@ -159,15 +160,16 @@ - - {{ form.title }} / {{ typeFormat(form) }} + {{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }} + >{{ form.operName }} / {{form.deptName}} / {{ form.operIp }} / {{ form.operLocation }} - {{ form.operUrl }} - {{ form.requestMethod }} + {{ form.requestMethod }} : {{form.operUrl }} + + + {{ form.title }} / {{ typeFormat(form) }} {{ form.method }} From 38785068af76f5ad589cf7ed0c3f3c4ba79937b7 Mon Sep 17 00:00:00 2001 From: Bozhu12 <1173930245@qq.com> Date: Fri, 27 Oct 2023 18:50:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BF=A1=E6=81=AF=E5=AE=8C=E5=96=84=20,=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AFUI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/framework/aspectj/LogAspect.java | 5 ++++- ruoyi-ui/src/views/monitor/operlog/index.vue | 12 +++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 1e0c05285..faf06f082 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.event.OperLogEvent; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.BusinessStatus; import com.ruoyi.common.enums.HttpMethod; import com.ruoyi.common.helper.LoginHelper; @@ -74,7 +75,9 @@ public class LogAspect { String ip = ServletUtils.getClientIP(); operLog.setOperIp(ip); operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255)); - operLog.setOperName(LoginHelper.getUsername()); + LoginUser loginUser = LoginHelper.getLoginUser(); + operLog.setOperName(loginUser.getUsername()); + operLog.setDeptName(loginUser.getDeptName()); if (e != null) { operLog.setStatus(BusinessStatus.FAIL.ordinal()); diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue index 03a1ea64f..b5d3abd5d 100644 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ b/ruoyi-ui/src/views/monitor/operlog/index.vue @@ -122,6 +122,7 @@ + @@ -159,15 +160,16 @@ - - {{ form.title }} / {{ typeFormat(form) }} + {{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }} + >{{ form.operName }} / {{form.deptName}} / {{ form.operIp }} / {{ form.operLocation }} - {{ form.operUrl }} - {{ form.requestMethod }} + {{ form.requestMethod }} {{form.operUrl }} + + + {{ form.title }} / {{ typeFormat(form) }} {{ form.method }} From 6e715d461a2f8d730a3c60208dd824e78430f578 Mon Sep 17 00:00:00 2001 From: Bozhu12 <1173930245@qq.com> Date: Sat, 28 Oct 2023 11:15:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20=E5=89=94=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=B8=B8=E7=94=A8=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/common/helper/LoginHelper.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java index 5e7fad208..b2a863eb9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java @@ -126,13 +126,6 @@ public class LoginHelper { return getLoginUser().getUsername(); } - /** - * 获取用户部门名称 - */ - public static String getDeptName() { - return getLoginUser().getDeptName(); - } - /** * 获取用户类型 */