From bac9aca311dba1b8796c6166d6618462fc7aa3a5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 20 七月 2023 17:56:04 +0800
Subject: [PATCH] 合并分支新内容
---
src/main/java/com/genersoft/iot/vmp/conf/security/SecurityUtils.java | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 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 76f1162..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
@@ -27,16 +27,13 @@
public static LoginUser login(String username, String password, AuthenticationManager authenticationManager) throws AuthenticationException {
//浣跨敤security妗嗘灦鑷甫鐨勯獙璇乼oken鐢熸垚鍣� 涔熷彲浠ヨ嚜瀹氫箟銆�
UsernamePasswordAuthenticationToken token =new UsernamePasswordAuthenticationToken(username,password);
-// Authentication authenticate = authenticationManager.authenticate(token);
-// SecurityContextHolder.getContext().setAuthentication(authenticate);
+ //璁よ瘉 濡傛灉澶辫触锛岃繖閲屼細鑷姩寮傚父鍚庤繑鍥烇紝鎵�浠ヨ繖閲屼笉闇�瑕佸垽鏂繑鍥炲�兼槸鍚︿负绌猴紝纭畾鏄惁鐧诲綍鎴愬姛
+ Authentication authenticate = authenticationManager.authenticate(token);
+ LoginUser user = (LoginUser) authenticate.getPrincipal();
+
SecurityContextHolder.getContext().setAuthentication(token);
-
-// LoginUser user = (LoginUser) authenticate.getPrincipal();
- User user = new User();
- user.setUsername(username);
- LoginUser loginUser = new LoginUser(user, LocalDateTime.now());
- return loginUser;
+ return user;
}
/**
@@ -56,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