github
/
eladmin
mirror of https://github.com/elunez/eladmin
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into deploy

pull/789/head
Zheng Jie 2022-05-26 13:44:09 +08:00
parent caafb830bf 0e7c4fcbff
commit 290ed67e70
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-logging/src/main/java/me/zhengjie/rest/LogController.java
View File

@ -71,7 +71,7 @@ public class LogController {
@ApiOperation("用户日志查询")
public ResponseEntity<Object> queryUserLog(LogQueryCriteria criteria, Pageable pageable){
criteria.setLogType("INFO");
criteria.setBlurry(SecurityUtils.getCurrentUsername());
criteria.setUsername(SecurityUtils.getCurrentUsername());
return new ResponseEntity<>(logService.queryAllByUser(criteria,pageable), HttpStatus.OK);
}

3
eladmin-logging/src/main/java/me/zhengjie/service/dto/LogQueryCriteria.java
View File

@ -31,6 +31,9 @@ public class LogQueryCriteria {
@Query(blurry = "username,description,address,requestIp,method,params")
private String blurry;
@Query
private String username;
@Query
private String logType;