From 4323c9394f5d80696e1cdb732ed9e98f96c0de2e Mon Sep 17 00:00:00 2001 From: 79493 <794930212@qq.com> Date: Mon, 10 Oct 2022 16:22:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/{EntUserDetails.java => UserDetailsAndId.java} | 4 ++-- .../main/java/com/rzyc/service/UserDetailsServiceImpl.java | 5 +++-- .../src/main/java/com/rzyc/service/UserLoginService.java | 5 +++-- .../config/{EntUserDetails.java => UserDetailsAndId.java} | 4 ++-- .../main/java/com/rzyc/service/UserDetailsServiceImpl.java | 5 +++-- .../src/main/java/com/rzyc/service/UserLoginService.java | 5 +++-- 6 files changed, 16 insertions(+), 12 deletions(-) rename inventory-ent/src/main/java/com/rzyc/config/{EntUserDetails.java => UserDetailsAndId.java} (74%) rename inventory-gov/src/main/java/com/rzyc/config/{EntUserDetails.java => UserDetailsAndId.java} (73%) diff --git a/inventory-ent/src/main/java/com/rzyc/config/EntUserDetails.java b/inventory-ent/src/main/java/com/rzyc/config/UserDetailsAndId.java similarity index 74% rename from inventory-ent/src/main/java/com/rzyc/config/EntUserDetails.java rename to inventory-ent/src/main/java/com/rzyc/config/UserDetailsAndId.java index c01bf41..6ce4160 100644 --- a/inventory-ent/src/main/java/com/rzyc/config/EntUserDetails.java +++ b/inventory-ent/src/main/java/com/rzyc/config/UserDetailsAndId.java @@ -12,7 +12,7 @@ import java.util.Collection; * @date 2022/9/28 * */ -public class EntUserDetails extends User { +public class UserDetailsAndId extends User { private String id; @@ -25,7 +25,7 @@ public class EntUserDetails extends User { this.id = id; } - public EntUserDetails(String username, String password, Collection authorities,String id) { + public UserDetailsAndId(String username, String password, Collection authorities,String id) { super(username, password, authorities); setId(id); } diff --git a/inventory-ent/src/main/java/com/rzyc/service/UserDetailsServiceImpl.java b/inventory-ent/src/main/java/com/rzyc/service/UserDetailsServiceImpl.java index ec571e4..ecd32fe 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/UserDetailsServiceImpl.java +++ b/inventory-ent/src/main/java/com/rzyc/service/UserDetailsServiceImpl.java @@ -1,6 +1,7 @@ package com.rzyc.service; -import com.rzyc.config.EntUserDetails; + +import com.rzyc.config.UserDetailsAndId; import com.rzyc.mapper.AuthorityKeyMapper; import com.rzyc.mapper.ent.EntUserMapper; import com.rzyc.model.AuthorityKey; @@ -65,7 +66,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { stringBuilder.append(s.getCategory() +":"+s.getAuthKey()); authority.add(new SimpleGrantedAuthority(stringBuilder.toString())); } - return new EntUserDetails(entUser.getName(), passwordEncoder.encode(entUser.getPasswd()), authority,entUser.getEntUserId()); + return new UserDetailsAndId(entUser.getName(), passwordEncoder.encode(entUser.getPasswd()), authority,entUser.getEntUserId()); } } diff --git a/inventory-ent/src/main/java/com/rzyc/service/UserLoginService.java b/inventory-ent/src/main/java/com/rzyc/service/UserLoginService.java index 38575d0..dc75687 100644 --- a/inventory-ent/src/main/java/com/rzyc/service/UserLoginService.java +++ b/inventory-ent/src/main/java/com/rzyc/service/UserLoginService.java @@ -2,7 +2,8 @@ package com.rzyc.service; import com.common.utils.jwt.JwtUtil; -import com.rzyc.config.EntUserDetails; + +import com.rzyc.config.UserDetailsAndId; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -51,7 +52,7 @@ public class UserLoginService { UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(authentication); //企业用户id - String id = ((EntUserDetails)SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getId(); + String id = ((UserDetailsAndId)SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getId(); token = JwtUtil.createToken(id); } catch (AuthenticationException e) { e.printStackTrace(); diff --git a/inventory-gov/src/main/java/com/rzyc/config/EntUserDetails.java b/inventory-gov/src/main/java/com/rzyc/config/UserDetailsAndId.java similarity index 73% rename from inventory-gov/src/main/java/com/rzyc/config/EntUserDetails.java rename to inventory-gov/src/main/java/com/rzyc/config/UserDetailsAndId.java index a8beed6..0ea8652 100644 --- a/inventory-gov/src/main/java/com/rzyc/config/EntUserDetails.java +++ b/inventory-gov/src/main/java/com/rzyc/config/UserDetailsAndId.java @@ -12,7 +12,7 @@ import java.util.Collection; * @date 2022/9/28 * */ -public class EntUserDetails extends User { +public class UserDetailsAndId extends User { private String id; @@ -25,7 +25,7 @@ public class EntUserDetails extends User { this.id = id; } - public EntUserDetails(String username, String password, Collection authorities, String id) { + public UserDetailsAndId(String username, String password, Collection authorities, String id) { super(username, password, authorities); setId(id); } diff --git a/inventory-gov/src/main/java/com/rzyc/service/UserDetailsServiceImpl.java b/inventory-gov/src/main/java/com/rzyc/service/UserDetailsServiceImpl.java index 8efadc2..a0a796c 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/UserDetailsServiceImpl.java +++ b/inventory-gov/src/main/java/com/rzyc/service/UserDetailsServiceImpl.java @@ -1,6 +1,7 @@ package com.rzyc.service; -import com.rzyc.config.EntUserDetails; + +import com.rzyc.config.UserDetailsAndId; import com.rzyc.mapper.AuthorityKeyMapper; import com.rzyc.mapper.ent.EntUserMapper; import com.rzyc.model.AuthorityKey; @@ -65,7 +66,7 @@ public class UserDetailsServiceImpl implements UserDetailsService { stringBuilder.append(s.getCategory() +":"+s.getAuthKey()); authority.add(new SimpleGrantedAuthority(stringBuilder.toString())); } - return new EntUserDetails(entUser.getName(), passwordEncoder.encode(entUser.getPasswd()), authority,entUser.getEntUserId()); + return new UserDetailsAndId(entUser.getName(), passwordEncoder.encode(entUser.getPasswd()), authority,entUser.getEntUserId()); } } diff --git a/inventory-gov/src/main/java/com/rzyc/service/UserLoginService.java b/inventory-gov/src/main/java/com/rzyc/service/UserLoginService.java index dd52e78..d9c16d8 100644 --- a/inventory-gov/src/main/java/com/rzyc/service/UserLoginService.java +++ b/inventory-gov/src/main/java/com/rzyc/service/UserLoginService.java @@ -2,7 +2,8 @@ package com.rzyc.service; import com.common.utils.jwt.JwtUtil; -import com.rzyc.config.EntUserDetails; + +import com.rzyc.config.UserDetailsAndId; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -52,7 +53,7 @@ public class UserLoginService { UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(authentication); //企业用户id - String id = ((EntUserDetails)SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getId(); + String id = ((UserDetailsAndId)SecurityContextHolder.getContext().getAuthentication().getPrincipal()).getId(); token = JwtUtil.createToken(id); } catch (AuthenticationException e) { e.printStackTrace();