From cfcda861640644e3597eff70775bfaf7186a55ad Mon Sep 17 00:00:00 2001
From: Iwan Lebron <105045937+iwanlebron@users.noreply.github.com>
Date: 星期四, 01 八月 2024 10:15:37 +0800
Subject: [PATCH] Merge branch '648540858:master' into master
---
src/main/java/com/genersoft/iot/vmp/conf/security/SecurityUtils.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/SecurityUtils.java b/src/main/java/com/genersoft/iot/vmp/conf/security/SecurityUtils.java
index a8d3568..f012f7e 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/security/SecurityUtils.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/security/SecurityUtils.java
@@ -53,14 +53,10 @@
Authentication authentication = getAuthentication();
if(authentication!=null){
Object principal = authentication.getPrincipal();
- if(principal!=null && !"anonymousUser".equals(principal)){
-// LoginUser user = (LoginUser) authentication.getPrincipal();
+ if(principal!=null && !"anonymousUser".equals(principal.toString())){
- String username = (String) principal;
- User user = new User();
- user.setUsername(username);
- LoginUser loginUser = new LoginUser(user, LocalDateTime.now());
- return loginUser;
+ User user = (User) principal;
+ return new LoginUser(user, LocalDateTime.now());
}
}
return null;
--
Gitblit v1.8.0