Commit 004692100920d3d4d7edb0fda08815a32d232da0
1 parent
f4ec1a5e
1.Role、SysUser实现序列化接口
Showing
3 changed files
with
6 additions
and
5 deletions
src/main/java/com/bsth/entity/sys/Role.java
| 1 | 1 | package com.bsth.entity.sys; |
| 2 | 2 | |
| 3 | +import java.io.Serializable; | |
| 3 | 4 | import java.util.Date; |
| 4 | 5 | import java.util.LinkedHashSet; |
| 5 | 6 | import java.util.Set; |
| ... | ... | @@ -18,7 +19,7 @@ import org.hibernate.annotations.Formula; |
| 18 | 19 | |
| 19 | 20 | @Entity |
| 20 | 21 | @Table(name = "bsth_c_sys_role") |
| 21 | -public class Role { | |
| 22 | +public class Role implements Serializable { | |
| 22 | 23 | |
| 23 | 24 | @Id |
| 24 | 25 | @GeneratedValue(strategy = GenerationType.IDENTITY) | ... | ... |
src/main/java/com/bsth/entity/sys/SysUser.java
| ... | ... | @@ -3,6 +3,7 @@ package com.bsth.entity.sys; |
| 3 | 3 | import com.fasterxml.jackson.annotation.JsonIgnoreProperties; |
| 4 | 4 | |
| 5 | 5 | import javax.persistence.*; |
| 6 | +import java.io.Serializable; | |
| 6 | 7 | import java.util.Date; |
| 7 | 8 | import java.util.LinkedHashSet; |
| 8 | 9 | import java.util.Set; |
| ... | ... | @@ -15,7 +16,7 @@ import java.util.Set; |
| 15 | 16 | @NamedAttributeNode("roles") |
| 16 | 17 | }) |
| 17 | 18 | }) |
| 18 | -public class SysUser { | |
| 19 | +public class SysUser implements Serializable { | |
| 19 | 20 | |
| 20 | 21 | @Id |
| 21 | 22 | @GeneratedValue(strategy = GenerationType.IDENTITY) | ... | ... |
src/main/java/com/bsth/security/util/SecurityUtils.java
| ... | ... | @@ -6,7 +6,6 @@ import com.bsth.entity.sys.SysUser; |
| 6 | 6 | import org.slf4j.Logger; |
| 7 | 7 | import org.slf4j.LoggerFactory; |
| 8 | 8 | import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; |
| 9 | -import org.springframework.security.core.Authentication; | |
| 10 | 9 | import org.springframework.security.core.GrantedAuthority; |
| 11 | 10 | import org.springframework.security.core.authority.SimpleGrantedAuthority; |
| 12 | 11 | import org.springframework.security.core.context.SecurityContext; |
| ... | ... | @@ -32,10 +31,10 @@ public class SecurityUtils { |
| 32 | 31 | * @Title: getCurrentUser |
| 33 | 32 | * @Description: TODO(获取当前用户) |
| 34 | 33 | */ |
| 35 | - public static SysUser getCurrentUser(HttpServletRequest request) { | |
| 34 | + public static SysUser getCurrentUser() { | |
| 36 | 35 | SysUser user = null; |
| 37 | 36 | try { |
| 38 | - user = (SysUser)(((SecurityContext)request.getSession().getAttribute("SPRING_SECURITY_CONTEXT")).getAuthentication().getPrincipal()); | |
| 37 | + user = (SysUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); | |
| 39 | 38 | } catch (Exception e) { |
| 40 | 39 | logger.error("", e); |
| 41 | 40 | } | ... | ... |