日志更新
This commit is contained in:
@@ -28,6 +28,7 @@ import org.aspectj.lang.reflect.MethodSignature;
|
|||||||
import org.nl.modules.common.utils.RequestHolder;
|
import org.nl.modules.common.utils.RequestHolder;
|
||||||
import org.nl.modules.common.utils.SecurityUtils;
|
import org.nl.modules.common.utils.SecurityUtils;
|
||||||
import org.nl.modules.common.utils.StringUtils;
|
import org.nl.modules.common.utils.StringUtils;
|
||||||
|
import org.nl.modules.common.utils.ThrowableUtil;
|
||||||
import org.nl.modules.logging.domain.Log;
|
import org.nl.modules.logging.domain.Log;
|
||||||
import org.nl.modules.logging.service.LogService;
|
import org.nl.modules.logging.service.LogService;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@@ -132,8 +133,7 @@ public class LogAspect {
|
|||||||
public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
|
public void logAfterThrowing(JoinPoint joinPoint, Throwable e) {
|
||||||
Log log = new Log("ERROR",System.currentTimeMillis() - currentTime.get());
|
Log log = new Log("ERROR",System.currentTimeMillis() - currentTime.get());
|
||||||
currentTime.remove();
|
currentTime.remove();
|
||||||
// log.setExceptionDetail(ThrowableUtil.getStackTrace(e).getBytes());
|
log.setExceptionDetail(ThrowableUtil.getStackTrace(e).getBytes());
|
||||||
// log.setExceptionDetail(null);
|
|
||||||
HttpServletRequest request = RequestHolder.getHttpServletRequest();
|
HttpServletRequest request = RequestHolder.getHttpServletRequest();
|
||||||
logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint)joinPoint, log);
|
logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint)joinPoint, log);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ import cn.hutool.core.lang.Dict;
|
|||||||
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import cn.hutool.json.JSONUtil;
|
import cn.hutool.json.JSONUtil;
|
||||||
import com.alibaba.fastjson.JSONObject;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.aspectj.lang.ProceedingJoinPoint;
|
import org.aspectj.lang.ProceedingJoinPoint;
|
||||||
import org.aspectj.lang.reflect.MethodSignature;
|
import org.aspectj.lang.reflect.MethodSignature;
|
||||||
import org.nl.modules.common.utils.PageUtil;
|
import org.nl.modules.common.utils.PageUtil;
|
||||||
@@ -33,10 +33,6 @@ import org.nl.modules.logging.service.LogService;
|
|||||||
import org.nl.modules.logging.service.dto.LogQueryCriteria;
|
import org.nl.modules.logging.service.dto.LogQueryCriteria;
|
||||||
import org.nl.modules.logging.service.mapstruct.LogErrorMapper;
|
import org.nl.modules.logging.service.mapstruct.LogErrorMapper;
|
||||||
import org.nl.modules.logging.service.mapstruct.LogSmallMapper;
|
import org.nl.modules.logging.service.mapstruct.LogSmallMapper;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
import org.slf4j.Marker;
|
|
||||||
import org.slf4j.MarkerFactory;
|
|
||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -57,9 +53,8 @@ import java.util.Map;
|
|||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
|
@Slf4j
|
||||||
public class LogServiceImpl implements LogService {
|
public class LogServiceImpl implements LogService {
|
||||||
private static final Marker MARKER = MarkerFactory.getMarker("request");
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(LogServiceImpl.class);
|
|
||||||
private final LogRepository logRepository;
|
private final LogRepository logRepository;
|
||||||
private final LogErrorMapper logErrorMapper;
|
private final LogErrorMapper logErrorMapper;
|
||||||
private final LogSmallMapper logSmallMapper;
|
private final LogSmallMapper logSmallMapper;
|
||||||
@@ -107,9 +102,7 @@ public class LogServiceImpl implements LogService {
|
|||||||
logDto.setMethod(methodName);
|
logDto.setMethod(methodName);
|
||||||
logDto.setUsername(username);
|
logDto.setUsername(username);
|
||||||
logDto.setParams(getParameter(method, joinPoint.getArgs()));
|
logDto.setParams(getParameter(method, joinPoint.getArgs()));
|
||||||
// logDto.setParams("");
|
|
||||||
logDto.setBrowser(browser);
|
logDto.setBrowser(browser);
|
||||||
log.info(MARKER,JSONObject.toJSONString(logDto));
|
|
||||||
logRepository.save(logDto);
|
logRepository.save(logDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,9 +33,9 @@
|
|||||||
<el-table-column prop="username" label="用户名" />
|
<el-table-column prop="username" label="用户名" />
|
||||||
<el-table-column prop="requestIp" label="IP" />
|
<el-table-column prop="requestIp" label="IP" />
|
||||||
<el-table-column show-overflow-tooltip prop="address" label="IP来源" />
|
<el-table-column show-overflow-tooltip prop="address" label="IP来源" />
|
||||||
<el-table-column prop="description" label="描述" />
|
<el-table-column prop="description" label="描述" show-overflow-tooltip />
|
||||||
<el-table-column prop="browser" label="浏览器" />
|
<el-table-column prop="browser" label="浏览器" min-width="120" show-overflow-tooltip />
|
||||||
<el-table-column prop="createTime" label="创建日期">
|
<el-table-column prop="createTime" label="创建日期" min-width="100" show-overflow-tooltip>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||||
</template>
|
</template>
|
||||||
@@ -78,7 +78,7 @@ export default {
|
|||||||
add: false,
|
add: false,
|
||||||
edit: false,
|
edit: false,
|
||||||
del: false,
|
del: false,
|
||||||
download: true
|
download: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
<el-table-column prop="requestIp" label="IP" />
|
<el-table-column prop="requestIp" label="IP" />
|
||||||
<el-table-column show-overflow-tooltip prop="address" label="IP来源" />
|
<el-table-column show-overflow-tooltip prop="address" label="IP来源" />
|
||||||
<el-table-column prop="description" label="描述" />
|
<el-table-column prop="description" label="描述" />
|
||||||
<el-table-column prop="browser" label="浏览器" />
|
<el-table-column prop="browser" label="浏览器" min-width="120" show-overflow-tooltip />
|
||||||
<el-table-column prop="time" label="请求耗时" align="center">
|
<el-table-column prop="time" label="请求耗时" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
|
<el-tag v-if="scope.row.time <= 300">{{ scope.row.time }}ms</el-tag>
|
||||||
@@ -72,7 +72,7 @@ export default {
|
|||||||
add: false,
|
add: false,
|
||||||
edit: false,
|
edit: false,
|
||||||
del: false,
|
del: false,
|
||||||
download: true
|
download: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ export default {
|
|||||||
add: false,
|
add: false,
|
||||||
edit: false,
|
edit: false,
|
||||||
del: false,
|
del: false,
|
||||||
download: true
|
download: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|||||||
Reference in New Issue
Block a user