fix(syslog): 操作日志写入异常不再抛出,避免数据已落库但接口仍报错
saveSysLog 整体包 try-catch,日志环节任何异常只记录 warn, 不影响业务事务和接口响应。
This commit is contained in:
@@ -2,6 +2,7 @@ package org.jeecg.common.aspect;
|
|||||||
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.alibaba.fastjson.serializer.PropertyFilter;
|
import com.alibaba.fastjson.serializer.PropertyFilter;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.shiro.SecurityUtils;
|
import org.apache.shiro.SecurityUtils;
|
||||||
import org.aspectj.lang.JoinPoint;
|
import org.aspectj.lang.JoinPoint;
|
||||||
import org.aspectj.lang.ProceedingJoinPoint;
|
import org.aspectj.lang.ProceedingJoinPoint;
|
||||||
@@ -39,6 +40,7 @@ import java.util.Date;
|
|||||||
* @email jeecgos@163.com
|
* @email jeecgos@163.com
|
||||||
* @Date 2018年1月14日
|
* @Date 2018年1月14日
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
@Aspect
|
@Aspect
|
||||||
@Component
|
@Component
|
||||||
public class AutoLogAspect {
|
public class AutoLogAspect {
|
||||||
@@ -66,51 +68,54 @@ public class AutoLogAspect {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void saveSysLog(ProceedingJoinPoint joinPoint, long time, Object obj) {
|
private void saveSysLog(ProceedingJoinPoint joinPoint, long time, Object obj) {
|
||||||
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
|
try {
|
||||||
Method method = signature.getMethod();
|
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
|
||||||
|
Method method = signature.getMethod();
|
||||||
|
|
||||||
LogDTO dto = new LogDTO();
|
LogDTO dto = new LogDTO();
|
||||||
AutoLog syslog = method.getAnnotation(AutoLog.class);
|
AutoLog syslog = method.getAnnotation(AutoLog.class);
|
||||||
if(syslog != null){
|
if(syslog != null){
|
||||||
//update-begin-author:taoyan date:
|
//update-begin-author:taoyan date:
|
||||||
String content = syslog.value();
|
String content = syslog.value();
|
||||||
if(syslog.module()== ModuleType.ONLINE){
|
if(syslog.module()== ModuleType.ONLINE){
|
||||||
content = getOnlineLogContent(obj, content);
|
content = getOnlineLogContent(obj, content);
|
||||||
|
}
|
||||||
|
//注解上的描述,操作日志内容
|
||||||
|
dto.setLogType(syslog.logType());
|
||||||
|
dto.setLogContent(content);
|
||||||
}
|
}
|
||||||
//注解上的描述,操作日志内容
|
|
||||||
dto.setLogType(syslog.logType());
|
//请求的方法名
|
||||||
dto.setLogContent(content);
|
String className = joinPoint.getTarget().getClass().getName();
|
||||||
|
String methodName = signature.getName();
|
||||||
|
dto.setMethod(className + "." + methodName + "()");
|
||||||
|
|
||||||
|
|
||||||
|
//设置操作类型
|
||||||
|
if (CommonConstant.LOG_TYPE_2 == dto.getLogType()) {
|
||||||
|
dto.setOperateType(getOperateType(methodName, syslog.operateType()));
|
||||||
|
}
|
||||||
|
|
||||||
|
//获取request
|
||||||
|
HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
|
||||||
|
//请求的参数
|
||||||
|
dto.setRequestParam(getReqestParams(request,joinPoint));
|
||||||
|
//设置IP地址
|
||||||
|
dto.setIp(IpUtils.getIpAddr(request));
|
||||||
|
//获取登录用户信息
|
||||||
|
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||||
|
if(sysUser!=null){
|
||||||
|
dto.setUserid(sysUser.getUsername());
|
||||||
|
dto.setUsername(sysUser.getRealname());
|
||||||
|
}
|
||||||
|
//耗时
|
||||||
|
dto.setCostTime(time);
|
||||||
|
dto.setCreateTime(new Date());
|
||||||
|
//保存系统日志
|
||||||
|
baseCommonService.addLog(dto);
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.warn("【系统日志-操作日志切面】记录操作日志异常,不影响业务执行, method: {}, error: {}", joinPoint.getSignature().toShortString(), e.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
//请求的方法名
|
|
||||||
String className = joinPoint.getTarget().getClass().getName();
|
|
||||||
String methodName = signature.getName();
|
|
||||||
dto.setMethod(className + "." + methodName + "()");
|
|
||||||
|
|
||||||
|
|
||||||
//设置操作类型
|
|
||||||
if (CommonConstant.LOG_TYPE_2 == dto.getLogType()) {
|
|
||||||
dto.setOperateType(getOperateType(methodName, syslog.operateType()));
|
|
||||||
}
|
|
||||||
|
|
||||||
//获取request
|
|
||||||
HttpServletRequest request = SpringContextUtils.getHttpServletRequest();
|
|
||||||
//请求的参数
|
|
||||||
dto.setRequestParam(getReqestParams(request,joinPoint));
|
|
||||||
//设置IP地址
|
|
||||||
dto.setIp(IpUtils.getIpAddr(request));
|
|
||||||
//获取登录用户信息
|
|
||||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
|
||||||
if(sysUser!=null){
|
|
||||||
dto.setUserid(sysUser.getUsername());
|
|
||||||
dto.setUsername(sysUser.getRealname());
|
|
||||||
|
|
||||||
}
|
|
||||||
//耗时
|
|
||||||
dto.setCostTime(time);
|
|
||||||
dto.setCreateTime(new Date());
|
|
||||||
//保存系统日志
|
|
||||||
baseCommonService.addLog(dto);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user