From deb1110ca94cb0ac7bcdc51b4e8dd00407792a94 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 18 Mar 2021 15:11:54 +0800
Subject: [PATCH] 优化去除token的操作

---
 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
index 0ce44ea..769ebc3 100644
--- a/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
+++ b/kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java
@@ -18,6 +18,7 @@
 import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextImpl;
 import org.springframework.security.oauth2.provider.OAuth2Authentication;
 import org.springframework.stereotype.Component;
@@ -63,17 +64,16 @@
     @SneakyThrows
     @Override
     public Object run() {
-       // Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-
-        RequestContext currentContext = RequestContext.getCurrentContext();
-        //获取request对象
-        HttpServletRequest request = currentContext.getRequest();
-
-        SecurityContextImpl securityContextImpl = (SecurityContextImpl) request
-                .getSession().getAttribute("SPRING_SECURITY_CONTEXT");
-        Authentication authentication = securityContextImpl.getAuthentication();
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
         if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) {
+                    RequestContext currentContext = RequestContext.getCurrentContext();
+        //获取request对象
+        HttpServletRequest request = currentContext.getRequest();
+        SecurityContextImpl securityContextImpl = (SecurityContextImpl) request
+                .getSession().getAttribute("SPRING_SECURITY_CONTEXT");
+
+        authentication = securityContextImpl.getAuthentication();
             Object principal = authentication.getPrincipal();
             RequestContext ctx = RequestContext.getCurrentContext();
             HttpServletRequest req = ctx.getRequest();
@@ -113,15 +113,6 @@
                 List<SysOrganization> organizations = (List<SysOrganization>) user.getOrganizations();
                 //将组织数据 存到header 里面
                 if (organizations != null&&organizations.size()>0) {
-                    System.out.println(organizations.size());
-                    System.out.println("111111111111111111111");
-                    for (SysOrganization organization : organizations) {
-                        if(organization!=null){
-                            System.out.println(organization.getOrgLevel());
-                        }
-                    }
-                    System.out.println("22222222222222");
-                    organizations.sort((e1,e2)->e1.getOrgLevel().compareTo(e2.getOrgLevel()));
                     ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_ID_HEADER,String.valueOf(organizations.get(0).getId()));
                     ctx.addZuulRequestHeader(SecurityConstants.USER_ORGS_HEADER,JSON.toJSONString(organizations));
                 }

--
Gitblit v1.8.0