root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:es

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-09 18:00:20 +08:00
parent 798c9cb024
commit c0661d4c39
6 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java
View File

@@ -74,9 +74,10 @@ public class LogAspect {
String methodName = joinPoint.getTarget().getClass().getName() + "." + signature.getName() + "()";
String params = getParameter(method, joinPoint.getArgs());
HttpServletRequest request = RequestHolder.getHttpServletRequest();
String url = request.getRequestURI();
String requestIp = StringUtils.getIp(request);
MDC.put("requestMethod",methodName);
MDC.put("requestMethod",url);
MDC.put("requestIp", StringUtils.getIp(request));
MDC.put("traceId", BaseCode.intToChars(IdUtil.getLongId()));
MDC.put("requestTime", DateUtil.now());
@@ -84,7 +85,7 @@ public class LogAspect {
Object result = null;
long comming = System.currentTimeMillis();
try {
log.info("[--request--][请求方法:{}][请求参数:{}]",methodName,params);
log.info("[--request--][请求接口:{}][请求参数:{}]",url,params);
result = joinPoint.proceed();
//是否把日志存到日志表
if (logInfo.isAddLogTable()) {
@@ -112,17 +113,16 @@ public class LogAspect {
json.put("return_result", parse);
interfaceLog.insert(json);
} catch (Exception e) {
}
}
}catch (Exception ex){
log.error("[--requestError--][请求方法:{}][请求参数:{}]【异常信息 :{}】", methodName,params, ex);
log.error("[--requestError--][请求接口:{}][请求参数:{}]【异常信息 :{}】", url,params, ex);
Log log = new Log("ERROR", System.currentTimeMillis() - comming);
log.setExceptionDetail(ThrowableUtil.getStackTrace(ex).getBytes());
logService.save(getUsername(), StringUtils.getBrowser(request), StringUtils.getIp(request), (ProceedingJoinPoint) joinPoint, log);
throw ex;
}finally {
log.info("[--response--][请求方法:{}][请求参数:{}],请求执行结束",methodName,params);
log.info("[--response--][请求接口:{}][请求参数:{}],请求执行结束",url,params);
MDC.clear();
}
return result;

2
lms/nladmin-system/src/main/java/org/nl/modules/logging/service/dto/LogQuery.java
View File

@@ -38,5 +38,5 @@ public class LogQuery {
private Integer size = 20;
private Integer page = 0;
private Integer page = 1;
}

5
lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java
View File

@@ -43,7 +43,7 @@ public class EsLogServiceImpl implements EsLogService {
if (logQuery != null){
BoolQueryBuilder query = QueryBuilders.boolQuery(); //requestMethod
extractedParam(logQuery, query);
Iterable<LogRepositoryDTO> all = esLogRepository.search(query, PageRequest.of(logQuery.getPage(),logQuery.getSize(), Sort.by("@timestamp").descending()));
Iterable<LogRepositoryDTO> all = esLogRepository.search(query, PageRequest.of(logQuery.getPage()-1,logQuery.getSize(), Sort.by("@timestamp").descending()));
page.setRecords(((AggregatedPageImpl) all).getContent());
page.setTotal(((AggregatedPageImpl) all).getTotalElements());
page.setPages(logQuery.getPage());
@@ -63,6 +63,7 @@ public class EsLogServiceImpl implements EsLogService {
if (logQuery.getFilterSql()){
query.mustNot().add(QueryBuilders.wildcardQuery("logger","org.nl.modules.wql.core.engine.*"));
}
query.mustNot().add(QueryBuilders.matchPhraseQuery("logger","org.elasticsearch.client.RestClient"));
if (StringUtils.isNotEmpty(logQuery.getTraceId())){
query.must().add(QueryBuilders.matchQuery("traceId", logQuery.getTraceId()));
}
@@ -85,7 +86,7 @@ public class EsLogServiceImpl implements EsLogService {
for (LevelEnum value : LevelEnum.values()) {
JSONObject level = new JSONObject();
level.put("label", value.name());
level.put("Value", value.name());
level.put("value", value.name());
result.add(level);
}
return result;