From 74ab88b5a31ae38b16062ca0a503ab6f992195a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=B5=A9=E5=BD=AC?= Date: Sun, 19 Nov 2017 15:46:01 +0800 Subject: [PATCH] =?UTF-8?q?[Fixbug]=20=E4=BF=AE=E5=A4=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wxiaoqi/security/admin/config/WebConfig.java | 3 ++- .../client/interceptor/ServiceAuthRestInterceptor.java | 2 +- .../security/gate/filter/AdminAccessFilter.java | 10 ++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/WebConfig.java b/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/WebConfig.java index 0debbea7..6f801192 100644 --- a/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/WebConfig.java +++ b/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/config/WebConfig.java @@ -47,7 +47,8 @@ public class WebConfig extends WebMvcConfigurerAdapter { String[] urls = { "/v2/api-docs", "/swagger-resources/**", - "/cache/**" + "/cache/**", + "/api/log/save" }; Collections.addAll(list, urls); return list; diff --git a/ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/interceptor/ServiceAuthRestInterceptor.java b/ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/interceptor/ServiceAuthRestInterceptor.java index 1af40c8f..aab22d5c 100644 --- a/ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/interceptor/ServiceAuthRestInterceptor.java +++ b/ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/interceptor/ServiceAuthRestInterceptor.java @@ -44,7 +44,7 @@ public class ServiceAuthRestInterceptor extends HandlerInterceptorAdapter { String token = request.getHeader(serviceAuthConfig.getTokenHeader()); IJWTInfo infoFromToken = serviceAuthUtil.getInfoFromToken(token); - String uniqueName = infoFromToken.getUniqueName(); // clientName（code） + String uniqueName = infoFromToken.getUniqueName(); for(String client:serviceAuthUtil.getAllowedClient()){ if(client.equals(uniqueName)){ return super.preHandle(request, response, handler); diff --git a/ace-gate/ace-gate-server/src/main/java/com/github/wxiaoqi/security/gate/filter/AdminAccessFilter.java b/ace-gate/ace-gate-server/src/main/java/com/github/wxiaoqi/security/gate/filter/AdminAccessFilter.java index a058ce67..38ebaefb 100644 --- a/ace-gate/ace-gate-server/src/main/java/com/github/wxiaoqi/security/gate/filter/AdminAccessFilter.java +++ b/ace-gate/ace-gate-server/src/main/java/com/github/wxiaoqi/security/gate/filter/AdminAccessFilter.java @@ -37,6 +37,7 @@ import java.util.Date; import java.util.List; import java.util.function.Predicate; import java.util.regex.Pattern; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -121,10 +122,11 @@ public class AdminAccessFilter extends ZuulFilter { } List permissionIfs = userService.getAllPermissionInfo(); // 判断资源是否启用权限约束 - Stream result = getPermissionIfs(requestUri, method, permissionIfs); - Object[] permissions = result.toArray(); + Stream stream = getPermissionIfs(requestUri, method, permissionIfs); + List result = stream.collect(Collectors.toList()); + PermissionInfo[] permissions = result.toArray(new PermissionInfo[]{}); if (permissions.length > 0) { - checkUserPermission((PermissionInfo[]) permissions, ctx, user); + checkUserPermission(permissions, ctx, user); } // 申请客户端密钥头 ctx.addZuulRequestHeader(serviceAuthConfig.getTokenHeader(), serviceAuthUtil.getClientToken()); @@ -198,7 +200,7 @@ public class AdminAccessFilter extends ZuulFilter { if (current == null) { setFailedRequest(JSON.toJSONString(new TokenForbiddenResponse("Token Forbidden!")), 200); } else { - if (!RequestMethod.GET.equals(current.getMethod())) { + if (!RequestMethod.GET.toString().equals(current.getMethod())) { setCurrentUserInfoAndLog(ctx, user, current); } } -- Gitee