From 9d9f582738123dbbfc6a7b91bb16ff4e4bf9f8f2 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Tue, 10 Feb 2026 13:51:13 +0800
Subject: [PATCH] 恢复日志展示
---
multi-framework/src/main/java/com/gkhy/exam/framework/aspectj/LogAspect.java | 248 +++++++++++++++++++++++++++++-
multi-admin/src/main/java/com/gkhy/exam/admin/controller/monitor/SysLogininforController.java | 99 ++++++-----
multi-framework/src/main/java/com/gkhy/exam/framework/web/service/SysLoginService.java | 12
multi-common/src/main/java/com/gkhy/exam/common/utils/StringUtils.java | 92 +++++++++++
multi-system/src/main/resources/mapper/system/SysOperLogMapper.xml | 2
5 files changed, 392 insertions(+), 61 deletions(-)
diff --git a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/monitor/SysLogininforController.java b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/monitor/SysLogininforController.java
index 8dde5f9..21ccd0d 100644
--- a/multi-admin/src/main/java/com/gkhy/exam/admin/controller/monitor/SysLogininforController.java
+++ b/multi-admin/src/main/java/com/gkhy/exam/admin/controller/monitor/SysLogininforController.java
@@ -1,50 +1,61 @@
package com.gkhy.exam.admin.controller.monitor;
+import com.gkhy.exam.common.annotation.Log;
+import com.gkhy.exam.common.api.CommonResult;
+import com.gkhy.exam.common.enums.BusinessType;
+import com.gkhy.exam.framework.web.service.SysPasswordService;
+import com.gkhy.exam.system.domain.SysLogininfor;
+import com.gkhy.exam.system.service.SysLogininforService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
/**
* 系统访问记录
- *
+ *
* @author ruoyi
*/
-//@Api(tags = "系统访问记录前端控制器")
-//@RestController
-//@RequestMapping("/monitor/logininfor")
-//public class SysLogininforController {
-// @Autowired
-// private SysLogininforService logininforService;
-//
-// @Autowired
-// private SysPasswordService passwordService;
-//
-// @ApiOperation(value = "系统访问记录列表")
-// @GetMapping("/list")
-// public CommonResult list(SysLogininfor logininfor)
-// {
-// return CommonResult.success(logininforService.selectLogininforList(logininfor));
-// }
-//
-// @ApiOperation(value = "批量删除访问记录")
-// @Log(title = "登录日志", businessType = BusinessType.DELETE)
-// @DeleteMapping("/{infoIds}")
-// public CommonResult remove(@PathVariable Long[] infoIds)
-// {
-// return CommonResult.success(logininforService.deleteLogininforByIds(infoIds));
-// }
-//
-// @ApiOperation(value = "清空访问记录")
-// @Log(title = "登录日志", businessType = BusinessType.CLEAN)
-// @DeleteMapping("/clean")
-// public CommonResult clean()
-// {
-// logininforService.cleanLogininfor();
-// return CommonResult.success();
-// }
-//
-// @ApiOperation(value = "账户解锁")
-// @Log(title = "账户解锁", businessType = BusinessType.OTHER)
-// @GetMapping("/unlock/{userName}")
-// public CommonResult unlock(@PathVariable("userName") String userName)
-// {
-// // passwordService.clearLoginRecordCache(userName);
-// return CommonResult.success();
-// }
-//}
+@Api(tags = "系统访问记录前端控制器")
+@RestController
+@RequestMapping("/monitor/logininfor")
+public class SysLogininforController {
+ @Autowired
+ private SysLogininforService logininforService;
+
+ @Autowired
+ private SysPasswordService passwordService;
+
+ @ApiOperation(value = "系统访问记录列表")
+ @GetMapping("/list")
+ public CommonResult list(SysLogininfor logininfor)
+ {
+ return CommonResult.success(logininforService.selectLogininforList(logininfor));
+ }
+
+ @ApiOperation(value = "批量删除访问记录")
+ @Log(title = "登录日志", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{infoIds}")
+ public CommonResult remove(@PathVariable Long[] infoIds)
+ {
+ return CommonResult.success(logininforService.deleteLogininforByIds(infoIds));
+ }
+
+ @ApiOperation(value = "清空访问记录")
+ @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+ @DeleteMapping("/clean")
+ public CommonResult clean()
+ {
+ logininforService.cleanLogininfor();
+ return CommonResult.success();
+ }
+
+ @ApiOperation(value = "账户解锁")
+ @Log(title = "账户解锁", businessType = BusinessType.OTHER)
+ @GetMapping("/unlock/{userName}")
+ public CommonResult unlock(@PathVariable("userName") String userName)
+ {
+ // passwordService.clearLoginRecordCache(userName);
+ return CommonResult.success();
+ }
+}
diff --git a/multi-common/src/main/java/com/gkhy/exam/common/utils/StringUtils.java b/multi-common/src/main/java/com/gkhy/exam/common/utils/StringUtils.java
index e9ed52d..9776989 100644
--- a/multi-common/src/main/java/com/gkhy/exam/common/utils/StringUtils.java
+++ b/multi-common/src/main/java/com/gkhy/exam/common/utils/StringUtils.java
@@ -5,10 +5,13 @@
import org.springframework.util.AntPathMatcher;
import java.util.List;
+import java.util.Map;
import static org.apache.commons.lang3.StringUtils.startsWithAny;
public class StringUtils extends StrUtil {
+
+ private static final String NULLSTR = "";
/**
* 是否为http(s)://开头
@@ -78,4 +81,93 @@
return matcher.match(pattern, url);
}
+ /**
+ * 截取字符串
+ *
+ * @param str 字符串
+ * @param start 开始
+ * @param end 结束
+ * @return 结果
+ */
+ public static String substring(final String str, int start, int end)
+ {
+ if (str == null)
+ {
+ return NULLSTR;
+ }
+
+ if (end < 0)
+ {
+ end = str.length() + end;
+ }
+ if (start < 0)
+ {
+ start = str.length() + start;
+ }
+
+ if (end > str.length())
+ {
+ end = str.length();
+ }
+
+ if (start > end)
+ {
+ return NULLSTR;
+ }
+
+ if (start < 0)
+ {
+ start = 0;
+ }
+ if (end < 0)
+ {
+ end = 0;
+ }
+
+ return str.substring(start, end);
+ }
+
+ /**
+ * * 判断一个对象是否为空
+ *
+ * @param object Object
+ * @return true：为空 false：非空
+ */
+ public static boolean isNull(Object object)
+ {
+ return object == null;
+ }
+ /**
+ * * 判断一个对象是否非空
+ *
+ * @param object Object
+ * @return true：非空 false：空
+ */
+ public static boolean isNotNull(Object object)
+ {
+ return !isNull(object);
+ }
+
+ /**
+ * * 判断一个Map是否为空
+ *
+ * @param map 要判断的Map
+ * @return true：为空 false：非空
+ */
+ public static boolean isEmpty(Map<?, ?> map)
+ {
+ return isNull(map) || map.isEmpty();
+ }
+
+ /**
+ * * 判断一个Map是否为空
+ *
+ * @param map 要判断的Map
+ * @return true：非空 false：空
+ */
+ public static boolean isNotEmpty(Map<?, ?> map)
+ {
+ return !isEmpty(map);
+ }
+
}
diff --git a/multi-framework/src/main/java/com/gkhy/exam/framework/aspectj/LogAspect.java b/multi-framework/src/main/java/com/gkhy/exam/framework/aspectj/LogAspect.java
index 19b9e4d..6170c38 100644
--- a/multi-framework/src/main/java/com/gkhy/exam/framework/aspectj/LogAspect.java
+++ b/multi-framework/src/main/java/com/gkhy/exam/framework/aspectj/LogAspect.java
@@ -1,35 +1,43 @@
package com.gkhy.exam.framework.aspectj;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.URLUtil;
import cn.hutool.extra.servlet.ServletUtil;
-import cn.hutool.json.JSONObject;
import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson2.filter.SimplePropertyPreFilter;
+import com.gkhy.exam.common.annotation.Log;
import com.gkhy.exam.common.domain.entity.SysUser;
+import com.gkhy.exam.common.enums.BusinessStatus;
import com.gkhy.exam.common.utils.SecurityUtils;
+import com.gkhy.exam.common.utils.ServletUtils;
import com.gkhy.exam.common.utils.StringUtils;
+import com.gkhy.exam.framework.manager.AsyncManager;
+import com.gkhy.exam.framework.manager.factory.AsyncFactory;
+import com.gkhy.exam.system.domain.SysOperLog;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.annotation.*;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.core.NamedThreadLocal;
import org.springframework.stereotype.Component;
+import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.spring.web.json.Json;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 操作日志记录处理
@@ -42,12 +50,199 @@
public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" };
private static final ThreadLocal<Long> TIME_THREADLOCAL=new NamedThreadLocal<>("Cost Time");
+ private static final int PARAM_MAX_LENGTH = 2000;
+
+
@Pointcut("execution(public * com.gkhy.exam.*.controller..*.*(..))")
public void logPointCut(){
}
+ /**
+ * 处理请求前执行
+ */
+ @Before(value = "@annotation(controllerLog)")
+ public void doBefore(JoinPoint joinPoint, Log controllerLog)
+ {
+ TIME_THREADLOCAL.set(System.currentTimeMillis());
+ }
+ /**
+ * 处理完请求后执行
+ *
+ * @param joinPoint 切点
+ */
+ @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
+ public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult)
+ {
+ handleLog(joinPoint, controllerLog, null, jsonResult);
+ }
+
+ /**
+ * 拦截异常操作
+ *
+ * @param joinPoint 切点
+ * @param e 异常
+ */
+ @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")
+ public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e)
+ {
+ handleLog(joinPoint, controllerLog, e, null);
+ }
+
+ protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult)
+ {
+ try
+ {
+ // 获取当前的用户
+ SysUser currentUser = SecurityUtils.getLoginUser().getUser();
+
+ // *========数据库日志=========*//
+ SysOperLog operLog = new SysOperLog();
+ operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+ // 请求的地址
+ HttpServletRequest request = ServletUtils.getRequest(); // 你的项目获取request的方式
+ String realIp = ServletUtil.getClientIP(request);
+ operLog.setOperIp(realIp);
+ operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
+ if (currentUser != null)
+ {
+ operLog.setOperName(currentUser.getUsername());
+ if (StringUtils.isNotNull(currentUser.getDeptName())
+ && StringUtils.isNotEmpty(currentUser.getDeptName()))
+ {
+ operLog.setDeptName(currentUser.getDeptName());
+ }
+ }
+
+ if (e != null)
+ {
+ operLog.setStatus(BusinessStatus.FAIL.ordinal());
+ operLog.setErrorMsg(StringUtils.substring(Convert.toStr(e.getMessage(), ExceptionUtil.getMessage(e)), 0, 2000));
+ }
+ // 设置方法名称
+ String className = joinPoint.getTarget().getClass().getName();
+ String methodName = joinPoint.getSignature().getName();
+ operLog.setMethod(className + "." + methodName + "()");
+ // 设置请求方式
+ operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
+ // 处理设置注解上的参数
+ getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
+ // 设置消耗时间
+ operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get());
+ // 保存数据库
+ AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
+ }
+ catch (Exception exp)
+ {
+ // 记录本地异常日志
+ log.error("异常信息:{}", exp.getMessage());
+ exp.printStackTrace();
+ }
+ finally
+ {
+ TIME_THREADLOCAL.remove();
+ }
+ }
+
+ /**
+ * 获取注解中对方法的描述信息 用于Controller层注解
+ *
+ * @param log 日志
+ * @param operLog 操作日志
+ * @throws Exception
+ */
+ public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception
+ {
+ // 设置action动作
+ operLog.setBusinessType(log.businessType().ordinal());
+ // 设置标题
+ operLog.setTitle(log.title());
+ // 设置操作人类别
+ operLog.setOperatorType(log.operatorType().ordinal());
+ // 是否需要保存request，参数和值
+ if (log.isSaveRequestData())
+ {
+ // 获取参数的信息，传入到数据库中。
+ setRequestValue(joinPoint, operLog, log.excludeParamNames());
+ }
+ // 是否需要保存response，参数和值
+ if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult))
+ {
+ operLog.setJsonResult(StringUtils.substring(JSONObject.toJSONString(jsonResult), 0, 2000));
+ }
+ }
+
+ /**
+ * 获取请求的参数，放到log中
+ *
+ * @param operLog 操作日志
+ * @throws Exception 异常
+ */
+ private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception
+ {
+ Map<String, String[]> map = ServletUtils.getRequest().getParameterMap();
+ if (StringUtils.isNotEmpty(map))
+ {
+ String params = JSON.toJSONString(map, excludePropertyPreFilter(excludeParamNames));
+ operLog.setOperParam(StringUtils.substring(params, 0, PARAM_MAX_LENGTH));
+ }
+ else
+ {
+ Object args = joinPoint.getArgs();
+ if (StringUtils.isNotNull(args))
+ {
+ String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
+ operLog.setOperParam(params);
+ }
+ }
+ }
+
+ /**
+ * 忽略敏感属性
+ */
+ public SimplePropertyPreFilter excludePropertyPreFilter(String[] excludeParamNames) {
+ // 1. 合并全局排除属性和自定义排除属性
+ String[] allExcludeNames = ArrayUtils.addAll(EXCLUDE_PROPERTIES, excludeParamNames);
+
+ // 2. 创建SimplePropertyPreFilter（你找到的这个类），指定排除属性
+ SimplePropertyPreFilter filter = new SimplePropertyPreFilter();
+ // 核心方法：添加需要排除的属性名（1.x的标准API）
+ filter.getExcludes().addAll(java.util.Arrays.asList(allExcludeNames));
+
+ return filter;
+ }
+
+ /**
+ * 参数拼装
+ */
+ private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames)
+ {
+ StringBuilder params = new StringBuilder();
+ if (paramsArray != null && paramsArray.length > 0)
+ {
+ for (Object o : paramsArray)
+ {
+ if (StringUtils.isNotNull(o) && !isFilterObject(o))
+ {
+ try
+ {
+ Object jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames));
+ params.append(jsonObj).append(" ");
+ if (params.length() >= PARAM_MAX_LENGTH)
+ {
+ return StringUtils.substring(params.toString(), 0, PARAM_MAX_LENGTH);
+ }
+ }
+ catch (Exception e)
+ {
+ log.error("请求参数拼装异常 msg:{}, 参数:{}", e.getMessage(), paramsArray, e);
+ }
+ }
+ }
+ }
+ return params.toString();
+ }
/**
@@ -143,6 +338,39 @@
}
}
-
+ /**
+ * 判断是否需要过滤的对象。
+ *
+ * @param o 对象信息。
+ * @return 如果是需要过滤的对象，则返回true；否则返回false。
+ */
+ @SuppressWarnings("rawtypes")
+ public boolean isFilterObject(final Object o)
+ {
+ Class<?> clazz = o.getClass();
+ if (clazz.isArray())
+ {
+ return clazz.getComponentType().isAssignableFrom(MultipartFile.class);
+ }
+ else if (Collection.class.isAssignableFrom(clazz))
+ {
+ Collection collection = (Collection) o;
+ for (Object value : collection)
+ {
+ return value instanceof MultipartFile;
+ }
+ }
+ else if (Map.class.isAssignableFrom(clazz))
+ {
+ Map map = (Map) o;
+ for (Object value : map.entrySet())
+ {
+ Map.Entry entry = (Map.Entry) value;
+ return entry.getValue() instanceof MultipartFile;
+ }
+ }
+ return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
+ || o instanceof BindingResult;
+ }
}
diff --git a/multi-framework/src/main/java/com/gkhy/exam/framework/web/service/SysLoginService.java b/multi-framework/src/main/java/com/gkhy/exam/framework/web/service/SysLoginService.java
index 5f6e60b..bbcdecc 100644
--- a/multi-framework/src/main/java/com/gkhy/exam/framework/web/service/SysLoginService.java
+++ b/multi-framework/src/main/java/com/gkhy/exam/framework/web/service/SysLoginService.java
@@ -94,18 +94,18 @@
authentication = authenticationManager.authenticate(authenticationToken);
LoginUserDetails loginUserDetails= (LoginUserDetails) authentication.getPrincipal();
passwordService.validate(loginUserDetails.getUser(),password);
- // AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_SUCCESS, "登录成功"));
+ AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_SUCCESS, "登录成功"));
recordLoginInfo(loginUserDetails.getUser().getId(),LoginUserTagEnum.ADMIN_USER);
return createLoginUser(loginUserDetails,LoginUserTagEnum.ADMIN_USER);
}catch (Exception e){
if (e instanceof BadCredentialsException)
{
- // AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_FAIL, "用户密码不匹配"));
+ AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_FAIL, "用户密码不匹配"));
throw new ApiException("用户密码不匹配");
}
else
{
- // AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_FAIL, e.getMessage()));
+ AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_FAIL, e.getMessage()));
throw new ApiException(e.getMessage());
}
}finally {
@@ -132,18 +132,18 @@
authentication = authenticationManager.authenticate(authenticationToken);
LoginUserDetails loginUserDetails= (LoginUserDetails) authentication.getPrincipal();
passwordService.validate(loginUserDetails.getUser(),password);
- // AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_SUCCESS, "登录成功"));
+ AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_SUCCESS, "登录成功"));
recordLoginInfo(loginUserDetails.getUser().getId(),LoginUserTagEnum.STUDENT_USER);
return createLoginUser(loginUserDetails,LoginUserTagEnum.STUDENT_USER);
}catch (Exception e){
if (e instanceof BadCredentialsException)
{
- // AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_FAIL, "用户密码不匹配"));
+ AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_FAIL, "用户密码不匹配"));
throw new ApiException("用户密码不匹配");
}
else
{
- // AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_FAIL, e.getMessage()));
+ AsyncManager.me().execute(AsyncFactory.recordLoginInfo(username, Constant.LOGIN_FAIL, e.getMessage()));
throw new ApiException(e.getMessage());
}
}finally {
diff --git a/multi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/multi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index e3c3d29..341b732 100644
--- a/multi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
+++ b/multi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -63,7 +63,7 @@
</select>
<delete id="deleteOperLogByIds" parameterType="Long">
- delete from sys_oper_log where oper_id in
+ delete from sys_oper_log where id in
<foreach collection="array" item="operId" open="(" separator="," close=")">
#{operId}
</foreach>
--
Gitblit v1.9.2