From 4130e1d3fc667fad3349e421e40a0ffa145c563c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 18 Nov 2020 17:20:46 +0800
Subject: [PATCH] 将获取用户信息的方式修改

---
 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 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 c628247..0ce44ea 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,7 +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,7 +63,16 @@
     @SneakyThrows
     @Override
     public Object run() {
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+       // 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();
+
         if (authentication != null && !(authentication instanceof AnonymousAuthenticationToken)) {
             Object principal = authentication.getPrincipal();
             RequestContext ctx = RequestContext.getCurrentContext();
@@ -103,8 +112,16 @@
                 tenantId=hospital.toString();
                 List<SysOrganization> organizations = (List<SysOrganization>) user.getOrganizations();
                 //将组织数据 存到header 里面
-                organizations.sort((e1,e2)->e1.getOrgLevel().compareTo(e2.getOrgLevel()));
                 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