diff --git a/src/main/java/org/springblade/core/oauth2/endpoint/OAuth2TokenEndPoint.java b/src/main/java/org/springblade/core/oauth2/endpoint/OAuth2TokenEndPoint.java index dac8efa..289be1b 100644 --- a/src/main/java/org/springblade/core/oauth2/endpoint/OAuth2TokenEndPoint.java +++ b/src/main/java/org/springblade/core/oauth2/endpoint/OAuth2TokenEndPoint.java @@ -1,5 +1,6 @@ package org.springblade.core.oauth2.endpoint; +import com.esotericsoftware.kryo.kryo5.minlog.Log; import com.wf.captcha.SpecCaptcha; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -179,4 +180,10 @@ public class OAuth2TokenEndPoint { this.authorizationHandler = authorizationHandler; this.tokenHandler = tokenHandler; } + + @GetMapping({"/oauth/token2"}) + @ApiLog(value = "获取登录信息") + public void token2() { + Log.info("获取用户信息"); + } } diff --git a/src/main/java/org/springblade/modules/system/mapper/LogApiMapper.xml b/src/main/java/org/springblade/modules/system/mapper/LogApiMapper.xml index e642251..602d8bc 100644 --- a/src/main/java/org/springblade/modules/system/mapper/LogApiMapper.xml +++ b/src/main/java/org/springblade/modules/system/mapper/LogApiMapper.xml @@ -35,16 +35,19 @@ WHERE create_by != '' - and method_name = 'token' + and method_name = 'token2' - and method_name != 'token' + and method_name != 'token2' - - AND create_time BETWEEN #{startTime} AND #{endTime} + + AND create_time =]]> CONCAT(#{startTime},' 00:00:00') - - and create_by = #{userId} + + AND create_time CONCAT(#{endTime},' 23:59:59') + + + and create_by = #{userName} ORDER BY create_time DESC diff --git a/src/main/java/org/springblade/modules/system/pojo/dto/LogDTO.java b/src/main/java/org/springblade/modules/system/pojo/dto/LogDTO.java index e7968ca..8bc0ba8 100644 --- a/src/main/java/org/springblade/modules/system/pojo/dto/LogDTO.java +++ b/src/main/java/org/springblade/modules/system/pojo/dto/LogDTO.java @@ -18,6 +18,6 @@ public class LogDTO { // 日志类型:1登录日志 2修改日志 private String logType; - // 用户id - private String userId; + // 用户账号 + private String userName; } diff --git a/src/main/java/org/springblade/modules/system/service/impl/LogApiServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/LogApiServiceImpl.java index 9566edb..8d15d7a 100644 --- a/src/main/java/org/springblade/modules/system/service/impl/LogApiServiceImpl.java +++ b/src/main/java/org/springblade/modules/system/service/impl/LogApiServiceImpl.java @@ -67,7 +67,7 @@ public class LogApiServiceImpl extends ServiceImpl impleme // 记录年月 AtomicReference yearMonth = new AtomicReference<>(null); // logs遍历计数器 - AtomicInteger count = new AtomicInteger(1); + AtomicInteger count = new AtomicInteger(0); // logs总长度 int totalLogs = logs.size(); @@ -138,9 +138,6 @@ public class LogApiServiceImpl extends ServiceImpl impleme // 最后一次执行的逻辑,将logRecord保存 logRecords.add(logRecord); } - - // 计数器增加 - count.incrementAndGet(); } return logRecords;