From e898c344aaa515b4fe16ae7ce3d979160d1e962b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 07 八月 2023 17:28:02 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
index 82d8fd0..090cf33 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -24,6 +24,7 @@
import javax.security.sasl.AuthenticationException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
import java.util.List;
@Tag(name = "鐢ㄦ埛绠＄悊")
@@ -211,9 +212,11 @@
public LoginUser getUserInfo() {
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
LoginUser userInfo = SecurityUtils.getUserInfo();
+
if (userInfo == null) {
throw new ControllerException(ErrorCode.ERROR100);
}
- return userInfo;
+ User user = userService.getUser(userInfo.getUsername(), userInfo.getPassword());
+ return new LoginUser(user, LocalDateTime.now());
}
}
--
Gitblit v1.8.0