修复获取pushKey

结构优化
648540858 2023-06-28 20:27:25 +08:00
parent f961515317
commit 9bd588957a
3 changed files with 838 additions and 331 deletions

View File

@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*;
import javax.security.sasl.AuthenticationException; import javax.security.sasl.AuthenticationException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@Tag(name = "用户管理") @Tag(name = "用户管理")
@ -211,9 +212,11 @@ public class UserController {
public LoginUser getUserInfo() { public LoginUser getUserInfo() {
// 获取当前登录用户id // 获取当前登录用户id
LoginUser userInfo = SecurityUtils.getUserInfo(); LoginUser userInfo = SecurityUtils.getUserInfo();
if (userInfo == null) { if (userInfo == null) {
throw new ControllerException(ErrorCode.ERROR100); throw new ControllerException(ErrorCode.ERROR100);
} }
return userInfo; User user = userService.getUser(userInfo.getUsername(), userInfo.getPassword());
return new LoginUser(user, LocalDateTime.now());
} }
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long