Commit 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d

Authored by xubinbin
1 parent 360fe689

bugfix:请求头带token, SecurityUtils 获取用户id 一直为0 #1195

src/main/java/com/genersoft/iot/vmp/conf/security/JwtAuthenticationFilter.java
@@ -78,6 +78,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { @@ -78,6 +78,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
78 78
79 // 构建UsernamePasswordAuthenticationToken,这里密码为null,是因为提供了正确的JWT,实现自动登录 79 // 构建UsernamePasswordAuthenticationToken,这里密码为null,是因为提供了正确的JWT,实现自动登录
80 User user = new User(); 80 User user = new User();
  81 + user.setId(jwtUser.getUserId());
81 user.setUsername(jwtUser.getUserName()); 82 user.setUsername(jwtUser.getUserName());
82 user.setPassword(jwtUser.getPassword()); 83 user.setPassword(jwtUser.getPassword());
83 Role role = new Role(); 84 Role role = new Role();
src/main/java/com/genersoft/iot/vmp/conf/security/JwtUtils.java
@@ -144,6 +144,7 @@ public class JwtUtils implements InitializingBean { @@ -144,6 +144,7 @@ public class JwtUtils implements InitializingBean {
144 jwtUser.setUserName(username); 144 jwtUser.setUserName(username);
145 jwtUser.setPassword(user.getPassword()); 145 jwtUser.setPassword(user.getPassword());
146 jwtUser.setRoleId(user.getRole().getId()); 146 jwtUser.setRoleId(user.getRole().getId());
  147 + jwtUser.setUserId(user.getId());
147 148
148 return jwtUser; 149 return jwtUser;
149 } catch (InvalidJwtException e) { 150 } catch (InvalidJwtException e) {
src/main/java/com/genersoft/iot/vmp/conf/security/dto/JwtUser.java
@@ -21,6 +21,7 @@ public class JwtUser { @@ -21,6 +21,7 @@ public class JwtUser {
21 EXCEPTION 21 EXCEPTION
22 } 22 }
23 23
  24 + private int userId;
24 private String userName; 25 private String userName;
25 26
26 private String password; 27 private String password;
@@ -29,6 +30,14 @@ public class JwtUser { @@ -29,6 +30,14 @@ public class JwtUser {
29 30
30 private TokenStatus status; 31 private TokenStatus status;
31 32
  33 + public int getUserId() {
  34 + return userId;
  35 + }
  36 +
  37 + public void setUserId(int userId) {
  38 + this.userId = userId;
  39 + }
  40 +
32 public String getUserName() { 41 public String getUserName() {
33 return userName; 42 return userName;
34 } 43 }