Skip to content

Commit 99fc3b4

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 824b2fe + b81f597 commit 99fc3b4

5 files changed

Lines changed: 2 additions & 9 deletions

File tree

src/main/java/cn/hellohao/auth/filter/SubjectFilter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ protected boolean isAccessAllowed(ServletRequest request, ServletResponse respon
8181
}
8282
}
8383

84-
// String token = httpServletRequest.getHeader("Authorization");
8584
JSONObject jsonObject = JWTUtil.checkToken(token);
8685
if(!jsonObject.getBoolean("check")){
8786
if(!serviceName.contains("admin") || serviceName.contains("admin/client")){
@@ -151,7 +150,6 @@ protected boolean onAccessDenied(ServletRequest request, ServletResponse respons
151150
} catch (Exception e) {
152151
System.out.println("返回token验证失败403请求,报异常了");
153152
}
154-
155153
return false;
156154
}
157155

src/main/java/cn/hellohao/auth/filter/xss/XssFilter.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,4 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
3232
filterChain.doFilter(new XssHttpServletRequestWrapper(request),servletResponse);
3333
}
3434

35-
@Override
36-
public void destroy() {
37-
38-
}
3935
}

src/main/java/cn/hellohao/auth/shiro/ShiroConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public ShiroFilterFactoryBean shiroFilterFactoryBean(@Qualifier("defaultWebSecur
4242
bean.setUnauthorizedUrl("/authError");
4343
bean.setFilterChainDefinitionMap(filterMap);
4444
return bean;
45-
4645
}
4746

4847
@Bean

src/main/java/cn/hellohao/auth/shiro/UserRealm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken tokenOB
5656
if(u==null){
5757
return null;
5858
}
59-
//密码认证(防止泄露,不需要我们做)
59+
//密码认证
6060
return new SimpleAuthenticationInfo(u,u.getPassword(),"");
6161
}
6262
}

src/main/java/cn/hellohao/auth/token/JWTUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public static String createToken(User user){
3636
}
3737

3838
public static JSONObject checkToken(String token){
39-
JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256(SECRET)).build();//验证对象
39+
JWTVerifier jwtVerifier = JWT.require(Algorithm.HMAC256(SECRET)).build();
4040
JSONObject jsonObject = new JSONObject();
4141
if(null==token){
4242
jsonObject.put("check",false);

0 commit comments

Comments
 (0)