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 | 61 +++++++++++++++++++++++++----- 1 files changed, 50 insertions(+), 11 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 121789a..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 @@ -1,32 +1,35 @@ package com.kidgrow.zuul.filter; -import cn.hutool.core.collection.CollectionUtil; import com.alibaba.fastjson.JSON; import com.kidgrow.common.constant.CommonConstant; import com.kidgrow.common.constant.SecurityConstants; import com.kidgrow.common.model.ResultBody; +import com.kidgrow.common.model.SysDoctor; import com.kidgrow.common.model.SysOrganization; import com.kidgrow.common.model.SysUser; import com.kidgrow.common.utils.AddrUtil; +import com.kidgrow.zuul.feign.SysDoctorService; import com.netflix.zuul.ZuulFilter; import com.netflix.zuul.context.RequestContext; import eu.bitwalker.useragentutils.UserAgent; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; 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; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.net.URLEncoder; +import java.util.HashMap; import java.util.List; +import java.util.Map; import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.FORM_BODY_WRAPPER_FILTER_ORDER; -import static org.springframework.cloud.netflix.zuul.filters.support.FilterConstants.PRE_DECORATION_FILTER_ORDER; /** * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br> @@ -39,6 +42,8 @@ @Slf4j @Component public class UserInfoHeaderFilter extends ZuulFilter { + @Autowired + private SysDoctorService sysDoctorService; @Override public String filterType() { return FilterConstants.PRE_TYPE; @@ -54,11 +59,21 @@ return true; } + + @SneakyThrows @Override public Object run() { 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(); @@ -66,21 +81,44 @@ String tenantId = ""; //客户端模式只返回一个clientId if (principal instanceof SysUser) { + SysUser user = (SysUser) authentication.getPrincipal(); + Map<String,Object> map=new HashMap<>(); + map.put("user_id",user.getId()); + ResultBody listByMap = sysDoctorService.getListByMap(map); + + List<SysDoctor> sysDoctors = JSON.parseArray(JSON.toJSONString(listByMap.getData()), SysDoctor.class); + String str=""; + Long hospital=-1L; + Long doctorId=-1L; + Long departmentId=-1L; + String departmentName=""; + if(sysDoctors!=null&&sysDoctors.size()>0){ + str= sysDoctors.get(0).getDoctorName(); + hospital=sysDoctors.get(0).getHospitalId(); + doctorId=sysDoctors.get(0).getId(); + departmentId=sysDoctors.get(0).getDepartmentId(); + departmentName=sysDoctors.get(0).getDepartmentName(); + ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_NAME_HEADER, URLEncoder.encode(sysDoctors.get(0).getHospitalName(),"UTF-8")); + ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_ID_HEADER,String.valueOf(departmentId)); + ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_NAME_HEADER,URLEncoder.encode(departmentName,"UTF-8")); + } ctx.addZuulRequestHeader(SecurityConstants.USER_ID_HEADER, String.valueOf(user.getId())); + ctx.addZuulRequestHeader(SecurityConstants.DOCTOR_ID_HEADER, String.valueOf(doctorId)); ctx.addZuulRequestHeader(SecurityConstants.USER_HEADER, user.getUsername()); - ctx.addZuulRequestHeader(SecurityConstants.USER_REAL_NAME, "");//待完善 + + ctx.addZuulRequestHeader(SecurityConstants.USER_REAL_NAME,URLEncoder.encode(str,"UTF-8")); + ctx.addZuulRequestHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER,hospital.toString()); + tenantId=hospital.toString(); List<SysOrganization> organizations = (List<SysOrganization>) user.getOrganizations(); //将组织数据 存到header 里面 - 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_ORG_NAME_HEADER, URLEncoder.encode(organizations.get(0).getOrgName(),"UTF-8")); - ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_ID_HEADER,String.valueOf(organizations.get(organizations.size()-1).getId())); - ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_NAME_HEADER,URLEncoder.encode(organizations.get(organizations.size()-1).getOrgName(),"UTF-8")); - ctx.addZuulRequestHeader(SecurityConstants.USER_ORGS_HEADER,JSON.toJSONString(organizations)); + if (organizations != null&&organizations.size()>0) { + ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_ID_HEADER,String.valueOf(organizations.get(0).getId())); + ctx.addZuulRequestHeader(SecurityConstants.USER_ORGS_HEADER,JSON.toJSONString(organizations)); + } //将角色放到header ctx.addZuulRequestHeader(SecurityConstants.ROLE_HEADER, JSON.toJSONString(user.getRoles())); - tenantId=String.valueOf(organizations.get(0).getId()); + } @@ -102,6 +140,7 @@ ctx.addZuulRequestHeader(CommonConstant.USER_AGENT_BROWSER, userAgent.getBrowser().toString()); ctx.addZuulRequestHeader(CommonConstant.USER_AGENT_SYSTEM, userAgent.getOperatingSystem().toString()); ctx.addZuulRequestHeader(CommonConstant.USER_AGENT_IP, AddrUtil.getRemoteAddr(req)); + ctx.addZuulRequestHeader(CommonConstant.USER_AGENT_SYSTEM_SCREEN, req.getHeader(CommonConstant.USER_AGENT_SYSTEM_SCREEN)); // UserAgentContextHolder.setUserAgent(AddrUtil.getRemoteAddr(req)+"kidgrow"+userAgent.getBrowser().toString()+"kidgrow"+userAgent.getOperatingSystem().toString()); -- Gitblit v1.8.0