|
|
|
@ -1,35 +1,36 @@
|
|
|
|
package com.ruoyi.framework.aspectj;
|
|
|
|
package com.ruoyi.framework.aspectj;
|
|
|
|
|
|
|
|
|
|
|
|
import com.alibaba.fastjson2.JSON;
|
|
|
|
import java.lang.reflect.Method;
|
|
|
|
|
|
|
|
import java.util.Collection;
|
|
|
|
|
|
|
|
import java.util.Iterator;
|
|
|
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
import org.aspectj.lang.JoinPoint;
|
|
|
|
|
|
|
|
import org.aspectj.lang.Signature;
|
|
|
|
|
|
|
|
import org.aspectj.lang.annotation.AfterReturning;
|
|
|
|
|
|
|
|
import org.aspectj.lang.annotation.AfterThrowing;
|
|
|
|
|
|
|
|
import org.aspectj.lang.annotation.Aspect;
|
|
|
|
|
|
|
|
import org.aspectj.lang.annotation.Pointcut;
|
|
|
|
|
|
|
|
import org.aspectj.lang.reflect.MethodSignature;
|
|
|
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
import org.springframework.web.servlet.HandlerMapping;
|
|
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
|
import com.ruoyi.common.annotation.Log;
|
|
|
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
|
|
|
import com.ruoyi.common.core.domain.model.LoginUser;
|
|
|
|
import com.ruoyi.common.enums.BusinessStatus;
|
|
|
|
import com.ruoyi.common.enums.BusinessStatus;
|
|
|
|
import com.ruoyi.common.enums.HttpMethod;
|
|
|
|
import com.ruoyi.common.enums.HttpMethod;
|
|
|
|
import com.ruoyi.common.filter.PropertyPreExcludeFilter;
|
|
|
|
|
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
|
|
|
|
|
import com.ruoyi.common.utils.ServletUtils;
|
|
|
|
import com.ruoyi.common.utils.ServletUtils;
|
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
|
import com.ruoyi.common.utils.ip.IpUtils;
|
|
|
|
import com.ruoyi.common.utils.ip.IpUtils;
|
|
|
|
|
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
|
import com.ruoyi.framework.manager.AsyncManager;
|
|
|
|
import com.ruoyi.framework.manager.AsyncManager;
|
|
|
|
import com.ruoyi.framework.manager.factory.AsyncFactory;
|
|
|
|
import com.ruoyi.framework.manager.factory.AsyncFactory;
|
|
|
|
import com.ruoyi.system.domain.SysOperLog;
|
|
|
|
import com.ruoyi.system.domain.SysOperLog;
|
|
|
|
import org.apache.commons.lang3.ArrayUtils;
|
|
|
|
|
|
|
|
import org.aspectj.lang.JoinPoint;
|
|
|
|
|
|
|
|
import org.aspectj.lang.annotation.AfterReturning;
|
|
|
|
|
|
|
|
import org.aspectj.lang.annotation.AfterThrowing;
|
|
|
|
|
|
|
|
import org.aspectj.lang.annotation.Aspect;
|
|
|
|
|
|
|
|
import org.aspectj.lang.annotation.Before;
|
|
|
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
|
|
import org.springframework.core.NamedThreadLocal;
|
|
|
|
|
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
|
|
import org.springframework.validation.BindingResult;
|
|
|
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
|
|
import java.util.Collection;
|
|
|
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 操作日志记录处理
|
|
|
|
* 操作日志记录处理
|
|
|
|
@ -40,19 +41,12 @@ import java.util.Map;
|
|
|
|
@Component
|
|
|
|
@Component
|
|
|
|
public class LogAspect
|
|
|
|
public class LogAspect
|
|
|
|
{
|
|
|
|
{
|
|
|
|
/** 排除敏感属性字段 */
|
|
|
|
|
|
|
|
public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" };
|
|
|
|
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
|
|
|
|
private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
|
|
|
|
/** 计算操作消耗时间 */
|
|
|
|
|
|
|
|
private static final ThreadLocal<Long> TIME_THREADLOCAL = new NamedThreadLocal<Long>("Cost Time");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
// 配置织入点
|
|
|
|
* 处理请求前执行
|
|
|
|
@Pointcut("@annotation(com.ruoyi.common.annotation.Log)")
|
|
|
|
*/
|
|
|
|
public void logPointCut()
|
|
|
|
@Before(value = "@annotation(controllerLog)")
|
|
|
|
|
|
|
|
public void boBefore(JoinPoint joinPoint, Log controllerLog)
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
TIME_THREADLOCAL.set(System.currentTimeMillis());
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@ -60,10 +54,10 @@ public class LogAspect
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param joinPoint 切点
|
|
|
|
* @param joinPoint 切点
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
|
|
|
|
@AfterReturning(pointcut = "logPointCut()", returning = "jsonResult")
|
|
|
|
public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult)
|
|
|
|
public void doAfterReturning(JoinPoint joinPoint, Object jsonResult)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
handleLog(joinPoint, controllerLog, null, jsonResult);
|
|
|
|
handleLog(joinPoint, null, jsonResult);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@ -72,16 +66,23 @@ public class LogAspect
|
|
|
|
* @param joinPoint 切点
|
|
|
|
* @param joinPoint 切点
|
|
|
|
* @param e 异常
|
|
|
|
* @param e 异常
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")
|
|
|
|
@AfterThrowing(value = "logPointCut()", throwing = "e")
|
|
|
|
public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e)
|
|
|
|
public void doAfterThrowing(JoinPoint joinPoint, Exception e)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
handleLog(joinPoint, controllerLog, e, null);
|
|
|
|
handleLog(joinPoint, e, null);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult)
|
|
|
|
protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
// 获得注解
|
|
|
|
|
|
|
|
Log controllerLog = getAnnotationLog(joinPoint);
|
|
|
|
|
|
|
|
if (controllerLog == null)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 获取当前的用户
|
|
|
|
// 获取当前的用户
|
|
|
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
|
LoginUser loginUser = SecurityUtils.getLoginUser();
|
|
|
|
|
|
|
|
|
|
|
|
@ -89,9 +90,12 @@ public class LogAspect
|
|
|
|
SysOperLog operLog = new SysOperLog();
|
|
|
|
SysOperLog operLog = new SysOperLog();
|
|
|
|
operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
|
|
|
|
operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
|
|
|
|
// 请求的地址
|
|
|
|
// 请求的地址
|
|
|
|
String ip = IpUtils.getIpAddr();
|
|
|
|
String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
|
|
|
|
operLog.setOperIp(ip);
|
|
|
|
operLog.setOperIp(ip);
|
|
|
|
operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
|
|
|
|
// 返回参数
|
|
|
|
|
|
|
|
operLog.setJsonResult(JSON.toJSONString(jsonResult));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
|
|
|
|
if (loginUser != null)
|
|
|
|
if (loginUser != null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
operLog.setOperName(loginUser.getUsername());
|
|
|
|
operLog.setOperName(loginUser.getUsername());
|
|
|
|
@ -109,22 +113,17 @@ public class LogAspect
|
|
|
|
// 设置请求方式
|
|
|
|
// 设置请求方式
|
|
|
|
operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
|
|
|
|
operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
|
|
|
|
// 处理设置注解上的参数
|
|
|
|
// 处理设置注解上的参数
|
|
|
|
getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
|
|
|
|
getControllerMethodDescription(joinPoint, controllerLog, operLog);
|
|
|
|
// 设置消耗时间
|
|
|
|
|
|
|
|
operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get());
|
|
|
|
|
|
|
|
// 保存数据库
|
|
|
|
// 保存数据库
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
|
|
|
|
AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (Exception exp)
|
|
|
|
catch (Exception exp)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// 记录本地异常日志
|
|
|
|
// 记录本地异常日志
|
|
|
|
|
|
|
|
log.error("==前置通知异常==");
|
|
|
|
log.error("异常信息:{}", exp.getMessage());
|
|
|
|
log.error("异常信息:{}", exp.getMessage());
|
|
|
|
exp.printStackTrace();
|
|
|
|
exp.printStackTrace();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
finally
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
TIME_THREADLOCAL.remove();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@ -134,7 +133,7 @@ public class LogAspect
|
|
|
|
* @param operLog 操作日志
|
|
|
|
* @param operLog 操作日志
|
|
|
|
* @throws Exception
|
|
|
|
* @throws Exception
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception
|
|
|
|
public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// 设置action动作
|
|
|
|
// 设置action动作
|
|
|
|
operLog.setBusinessType(log.businessType().ordinal());
|
|
|
|
operLog.setBusinessType(log.businessType().ordinal());
|
|
|
|
@ -146,12 +145,7 @@ public class LogAspect
|
|
|
|
if (log.isSaveRequestData())
|
|
|
|
if (log.isSaveRequestData())
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// 获取参数的信息，传入到数据库中。
|
|
|
|
// 获取参数的信息，传入到数据库中。
|
|
|
|
setRequestValue(joinPoint, operLog, log.excludeParamNames());
|
|
|
|
setRequestValue(joinPoint, operLog);
|
|
|
|
}
|
|
|
|
|
|
|
|
// 是否需要保存response，参数和值
|
|
|
|
|
|
|
|
if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -161,56 +155,57 @@ public class LogAspect
|
|
|
|
* @param operLog 操作日志
|
|
|
|
* @param operLog 操作日志
|
|
|
|
* @throws Exception 异常
|
|
|
|
* @throws Exception 异常
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception
|
|
|
|
private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
|
|
|
|
|
|
|
|
String requestMethod = operLog.getRequestMethod();
|
|
|
|
String requestMethod = operLog.getRequestMethod();
|
|
|
|
if (StringUtils.isEmpty(paramsMap)
|
|
|
|
if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
|
|
|
|
&& (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)))
|
|
|
|
|
|
|
|
{
|
|
|
|
{
|
|
|
|
String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
|
|
|
|
String params = argsArrayToString(joinPoint.getArgs());
|
|
|
|
operLog.setOperParam(StringUtils.substring(params, 0, 2000));
|
|
|
|
operLog.setOperParam(StringUtils.substring(params, 0, 2000));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, 2000));
|
|
|
|
Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
|
|
|
|
|
|
|
|
operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 是否存在注解，如果存在就获取
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
private Log getAnnotationLog(JoinPoint joinPoint) throws Exception
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Signature signature = joinPoint.getSignature();
|
|
|
|
|
|
|
|
MethodSignature methodSignature = (MethodSignature) signature;
|
|
|
|
|
|
|
|
Method method = methodSignature.getMethod();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (method != null)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return method.getAnnotation(Log.class);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 参数拼装
|
|
|
|
* 参数拼装
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames)
|
|
|
|
private String argsArrayToString(Object[] paramsArray)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
String params = "";
|
|
|
|
String params = "";
|
|
|
|
if (paramsArray != null && paramsArray.length > 0)
|
|
|
|
if (paramsArray != null && paramsArray.length > 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
for (Object o : paramsArray)
|
|
|
|
for (int i = 0; i < paramsArray.length; i++)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (StringUtils.isNotNull(o) && !isFilterObject(o))
|
|
|
|
if (StringUtils.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i]))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
try
|
|
|
|
Object jsonObj = JSON.toJSON(paramsArray[i]);
|
|
|
|
{
|
|
|
|
|
|
|
|
String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames));
|
|
|
|
|
|
|
|
params += jsonObj.toString() + " ";
|
|
|
|
params += jsonObj.toString() + " ";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (Exception e)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return params.trim();
|
|
|
|
return params.trim();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* 忽略敏感属性
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
public PropertyPreExcludeFilter excludePropertyPreFilter(String[] excludeParamNames)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return new PropertyPreExcludeFilter().addExcludes(ArrayUtils.addAll(EXCLUDE_PROPERTIES, excludeParamNames));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 判断是否需要过滤的对象。
|
|
|
|
* 判断是否需要过滤的对象。
|
|
|
|
*
|
|
|
|
*
|
|
|
|
@ -228,17 +223,17 @@ public class LogAspect
|
|
|
|
else if (Collection.class.isAssignableFrom(clazz))
|
|
|
|
else if (Collection.class.isAssignableFrom(clazz))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Collection collection = (Collection) o;
|
|
|
|
Collection collection = (Collection) o;
|
|
|
|
for (Object value : collection)
|
|
|
|
for (Iterator iter = collection.iterator(); iter.hasNext();)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return value instanceof MultipartFile;
|
|
|
|
return iter.next() instanceof MultipartFile;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (Map.class.isAssignableFrom(clazz))
|
|
|
|
else if (Map.class.isAssignableFrom(clazz))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Map map = (Map) o;
|
|
|
|
Map map = (Map) o;
|
|
|
|
for (Object value : map.entrySet())
|
|
|
|
for (Iterator iter = map.entrySet().iterator(); iter.hasNext();)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Map.Entry entry = (Map.Entry) value;
|
|
|
|
Map.Entry entry = (Map.Entry) iter.next();
|
|
|
|
return entry.getValue() instanceof MultipartFile;
|
|
|
|
return entry.getValue() instanceof MultipartFile;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
