mirror of https://gitee.com/y_project/RuoYi.git
fix log record,add sync model.
liuhulu
parent
c41b58d478
commit
7886e2bb9a
|
|
@ -2,6 +2,7 @@ package com.ruoyi.framework.aspectj;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.aspectj.lang.JoinPoint;
|
import org.aspectj.lang.JoinPoint;
|
||||||
import org.aspectj.lang.Signature;
|
import org.aspectj.lang.Signature;
|
||||||
import org.aspectj.lang.annotation.AfterReturning;
|
import org.aspectj.lang.annotation.AfterReturning;
|
||||||
|
|
@ -12,7 +13,10 @@ import org.aspectj.lang.reflect.MethodSignature;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.scheduling.annotation.Async;
|
||||||
|
import org.springframework.scheduling.annotation.EnableAsync;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.ruoyi.common.constant.UserConstants;
|
import com.ruoyi.common.constant.UserConstants;
|
||||||
import com.ruoyi.common.utils.ServletUtils;
|
import com.ruoyi.common.utils.ServletUtils;
|
||||||
|
|
@ -31,141 +35,129 @@ import com.ruoyi.project.system.user.domain.User;
|
||||||
|
|
||||||
@Aspect
|
@Aspect
|
||||||
@Component
|
@Component
|
||||||
public class LogAspect
|
@EnableAsync
|
||||||
{
|
public class LogAspect {
|
||||||
private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
|
private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IOperLogService operLogService;
|
private IOperLogService operLogService;
|
||||||
|
|
||||||
// 配置织入点
|
// 配置织入点
|
||||||
@Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.Log)")
|
@Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.Log)")
|
||||||
public void logPointCut()
|
public void logPointCut() {
|
||||||
{
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 前置通知 用于拦截操作
|
* 前置通知 用于拦截操作
|
||||||
*
|
*
|
||||||
* @param joinPoint 切点
|
* @param joinPoint
|
||||||
*/
|
* 切点
|
||||||
@AfterReturning(pointcut = "logPointCut()")
|
*/
|
||||||
public void doBefore(JoinPoint joinPoint)
|
@AfterReturning(pointcut = "logPointCut()")
|
||||||
{
|
public void doBefore(JoinPoint joinPoint) {
|
||||||
handleLog(joinPoint, null);
|
handleLog(joinPoint, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 拦截异常操作
|
* 拦截异常操作
|
||||||
*
|
*
|
||||||
* @param joinPoint
|
* @param joinPoint
|
||||||
* @param e
|
* @param e
|
||||||
*/
|
*/
|
||||||
@AfterThrowing(value = "logPointCut()", throwing = "e")
|
@AfterThrowing(value = "logPointCut()", throwing = "e")
|
||||||
public void doAfter(JoinPoint joinPoint, Exception e)
|
public void doAfter(JoinPoint joinPoint, Exception e) {
|
||||||
{
|
handleLog(joinPoint, e);
|
||||||
handleLog(joinPoint, e);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private void handleLog(JoinPoint joinPoint, Exception e)
|
@Async
|
||||||
{
|
private void handleLog(final JoinPoint joinPoint, final Exception e) {
|
||||||
try
|
try {
|
||||||
{
|
// 获得注解
|
||||||
// 获得注解
|
Log controllerLog = getAnnotationLog(joinPoint);
|
||||||
Log controllerLog = getAnnotationLog(joinPoint);
|
if (controllerLog == null) {
|
||||||
if (controllerLog == null)
|
return;
|
||||||
{
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 获取当前的用户
|
// 获取当前的用户
|
||||||
User currentUser = ShiroUtils.getUser();
|
User currentUser = ShiroUtils.getUser();
|
||||||
|
|
||||||
// *========数据库日志=========*//
|
// *========数据库日志=========*//
|
||||||
OperLog operLog = new OperLog();
|
OperLog operLog = new OperLog();
|
||||||
operLog.setStatus(UserConstants.NORMAL);
|
operLog.setStatus(UserConstants.NORMAL);
|
||||||
// 请求的地址
|
// 请求的地址
|
||||||
String ip = ShiroUtils.getIp();
|
String ip = ShiroUtils.getIp();
|
||||||
operLog.setOperIp(ip);
|
operLog.setOperIp(ip);
|
||||||
operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
|
operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
|
||||||
if (currentUser != null)
|
if (currentUser != null) {
|
||||||
{
|
operLog.setLoginName(currentUser.getLoginName());
|
||||||
operLog.setLoginName(currentUser.getLoginName());
|
operLog.setDeptName(currentUser.getDept().getDeptName());
|
||||||
operLog.setDeptName(currentUser.getDept().getDeptName());
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (e != null)
|
if (e != null) {
|
||||||
{
|
operLog.setStatus(UserConstants.EXCEPTION);
|
||||||
operLog.setStatus(UserConstants.EXCEPTION);
|
operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
|
||||||
operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
|
}
|
||||||
}
|
// 设置方法名称
|
||||||
// 设置方法名称
|
String className = joinPoint.getTarget().getClass().getName();
|
||||||
String className = joinPoint.getTarget().getClass().getName();
|
String methodName = joinPoint.getSignature().getName();
|
||||||
String methodName = joinPoint.getSignature().getName();
|
operLog.setMethod(className + "." + methodName + "()");
|
||||||
operLog.setMethod(className + "." + methodName + "()");
|
// 处理设置注解上的参数
|
||||||
// 处理设置注解上的参数
|
getControllerMethodDescription(controllerLog, operLog);
|
||||||
getControllerMethodDescription(controllerLog, operLog);
|
// 保存数据库
|
||||||
// 保存数据库
|
operLogService.insertOperlog(operLog);
|
||||||
operLogService.insertOperlog(operLog);
|
} catch (Exception exp) {
|
||||||
}
|
// 记录本地异常日志
|
||||||
catch (Exception exp)
|
log.error("==前置通知异常==");
|
||||||
{
|
log.error("异常信息:{}", exp.getMessage());
|
||||||
// 记录本地异常日志
|
exp.printStackTrace();
|
||||||
log.error("==前置通知异常==");
|
}
|
||||||
log.error("异常信息:{}", exp.getMessage());
|
}
|
||||||
exp.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取注解中对方法的描述信息 用于Controller层注解
|
* 获取注解中对方法的描述信息 用于Controller层注解
|
||||||
*
|
*
|
||||||
* @param joinPoint 切点
|
* @param joinPoint
|
||||||
* @return 方法描述
|
* 切点
|
||||||
* @throws Exception
|
* @return 方法描述
|
||||||
*/
|
* @throws Exception
|
||||||
public static void getControllerMethodDescription(Log log, OperLog operLog) throws Exception
|
*/
|
||||||
{
|
public void getControllerMethodDescription(Log log, OperLog operLog) throws Exception {
|
||||||
// 设置action动作
|
// 设置action动作
|
||||||
operLog.setAction(log.action());
|
operLog.setAction(log.action());
|
||||||
// 设置标题
|
// 设置标题
|
||||||
operLog.setTitle(log.title());
|
operLog.setTitle(log.title());
|
||||||
// 设置channel
|
// 设置channel
|
||||||
operLog.setChannel(log.channel());
|
operLog.setChannel(log.channel());
|
||||||
// 是否需要保存request，参数和值
|
// 是否需要保存request，参数和值
|
||||||
if (log.isSaveRequestData())
|
if (log.isSaveRequestData()) {
|
||||||
{
|
// 获取参数的信息，传入到数据库中。
|
||||||
// 获取参数的信息，传入到数据库中。
|
setRequestValue(operLog);
|
||||||
setRequestValue(operLog);
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取请求的参数，放到log中
|
* 获取请求的参数，放到log中
|
||||||
*
|
*
|
||||||
* @param operLog
|
* @param operLog
|
||||||
* @param request
|
* @param request
|
||||||
*/
|
*/
|
||||||
private static void setRequestValue(OperLog operLog)
|
private void setRequestValue(OperLog operLog) {
|
||||||
{
|
Map<String, String[]> map = ServletUtils.getRequest().getParameterMap();
|
||||||
Map<String, String[]> map = ServletUtils.getRequest().getParameterMap();
|
String params = JSONObject.toJSONString(map);
|
||||||
String params = JSONObject.toJSONString(map);
|
operLog.setOperParam(StringUtils.substring(params, 0, 255));
|
||||||
operLog.setOperParam(StringUtils.substring(params, 0, 255));
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 是否存在注解，如果存在就获取
|
* 是否存在注解，如果存在就获取
|
||||||
*/
|
*/
|
||||||
private static Log getAnnotationLog(JoinPoint joinPoint) throws Exception
|
private Log getAnnotationLog(JoinPoint joinPoint) throws Exception {
|
||||||
{
|
Signature signature = joinPoint.getSignature();
|
||||||
Signature signature = joinPoint.getSignature();
|
MethodSignature methodSignature = (MethodSignature) signature;
|
||||||
MethodSignature methodSignature = (MethodSignature) signature;
|
Method method = methodSignature.getMethod();
|
||||||
Method method = methodSignature.getMethod();
|
|
||||||
|
|
||||||
if (method != null)
|
if (method != null) {
|
||||||
{
|
return method.getAnnotation(Log.class);
|
||||||
return method.getAnnotation(Log.class);
|
}
|
||||||
}
|
return null;
|
||||||
return null;
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue