From ec9b01c7734ede602909f33095f3313c6578ccc0 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Tue, 17 Oct 2023 11:58:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8E=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=93=8D=E4=BD=9C=E4=BA=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1031897 --user=刘瑞斌 【系统设置】github#27080,登录日志无操作人 https://www.tapd.cn/55049933/s/1427027 --- .../io/metersphere/gateway/controller/LoginController.java | 2 +- .../java/io/metersphere/gateway/log/aspect/MsLogAspect.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/framework/gateway/src/main/java/io/metersphere/gateway/controller/LoginController.java b/framework/gateway/src/main/java/io/metersphere/gateway/controller/LoginController.java index 4d1f784d5b..87503c3256 100644 --- a/framework/gateway/src/main/java/io/metersphere/gateway/controller/LoginController.java +++ b/framework/gateway/src/main/java/io/metersphere/gateway/controller/LoginController.java @@ -78,7 +78,7 @@ public class LoginController { @PostMapping(value = "/signin") @MsAuditLog(module = OperLogModule.AUTH_TITLE, type = OperLogConstants.LOGIN, title = "登录") public Mono login(@RequestBody LoginRequest request, WebSession session, Locale locale) { - return Mono.defer(() -> userLoginService.login(request, session, locale).map(Mono::just).orElseGet(Mono::empty)) + return Mono.just(userLoginService.login(request, session, locale)) .subscribeOn(Schedulers.boundedElastic()) .switchIfEmpty(Mono.error(new ResponseStatusException(HttpStatus.BAD_REQUEST, "Not found user info or invalid password"))) .map(ResultHolder::success) diff --git a/framework/gateway/src/main/java/io/metersphere/gateway/log/aspect/MsLogAspect.java b/framework/gateway/src/main/java/io/metersphere/gateway/log/aspect/MsLogAspect.java index 489c58fa4e..64603038dd 100644 --- a/framework/gateway/src/main/java/io/metersphere/gateway/log/aspect/MsLogAspect.java +++ b/framework/gateway/src/main/java/io/metersphere/gateway/log/aspect/MsLogAspect.java @@ -113,8 +113,9 @@ public class MsLogAspect { if (arg instanceof WebSession session) { Object user = session.getAttribute("user"); if (user != null) { - String username = (String) MethodUtils.invokeExactMethod(user, "getName"); - msOperLog.setOperUser(username); + String userId = (String) MethodUtils.invokeExactMethod(user, "getId"); + msOperLog.setOperUser(userId); + msOperLog.setCreateUser(userId); } break; }