何博文 / trash · Commits

Commit 56ffd3139a7b7a66370adc0f021cdb74a44bea0f

Authored by youxiw2000
1 parent 4f6620f4

m

Inline Side-by-side
Showing 2 changed files with 10 additions and 25 deletions
trash-framework/src/main/java/com/trash/framework/security/filter/JwtAuthenticationTokenFilter.java
  View file @56ffd31
@@ -45,7 +45,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter @@ -45,7 +45,7 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
45 String token = request.getHeader("Authorization"); 45 String token = request.getHeader("Authorization");
46 46
47 if(token == null){ 47 if(token == null){
48 - token = getTokenFromCookies(request); 48 + token = tokenService.getTokenFromCookies(request);
49 } 49 }
50 50
51 if(token!= null && !token.equals("undefined")){ 51 if(token!= null && !token.equals("undefined")){
@@ -67,17 +67,6 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter @@ -67,17 +67,6 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter
67 chain.doFilter(request, response); 67 chain.doFilter(request, response);
68 } 68 }
69 69
70 - private String getTokenFromCookies(HttpServletRequest request) {  
71 -  
72 - for(Cookie cookie : request.getCookies()){  
73 -  
74 - if(("token").equals(cookie.getName())){  
75 - return cookie.getValue();  
76 - }  
77 - }  
78 -  
79 - return null;  
80 - }  
81 70
82 private LoginUser requestRemoteUser(String token) { 71 private LoginUser requestRemoteUser(String token) {
83 return loginService.loginByRemote(token); 72 return loginService.loginByRemote(token);
trash-framework/src/main/java/com/trash/framework/web/service/TokenService.java
  View file @56ffd31
@@ -71,25 +71,21 @@ public class TokenService @@ -71,25 +71,21 @@ public class TokenService
71 LoginUser user = redisCache.getCacheObject(userKey); 71 LoginUser user = redisCache.getCacheObject(userKey);
72 return user; 72 return user;
73 } 73 }
74 -  
75 - token = getTokenFromCookies(request);  
76 - if(StringUtils.isNotEmpty(token)){  
77 - String userKey = getTokenKey(token);  
78 - LoginUser user = redisCache.getCacheObject(userKey);  
79 - return user;  
80 - } 74 +
81 return null; 75 return null;
82 } 76 }
83 77
84 78
85 - private String getTokenFromCookies(HttpServletRequest request) {  
86 - for(Cookie cookie : request.getCookies()){  
87 -  
88 - if(("token").equals(cookie.getName())){  
89 - return cookie.getValue(); 79 + public String getTokenFromCookies(HttpServletRequest request) {
  80 + try {
  81 + for(Cookie cookie : request.getCookies()){
  82 + if(("token").equals(cookie.getName())){
  83 + return cookie.getValue();
  84 + }
90 } 85 }
  86 + } catch (Exception e) {
  87 + e.printStackTrace();
91 } 88 }
92 -  
93 return null; 89 return null;
94 } 90 }
95 91