From f21c78ae0e3c410c6ba5be77277b5b491aca3af1 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <913652501@qq.com> Date: Fri, 22 May 2020 10:25:46 +0800 Subject: [PATCH] 添加短信服务的功能,添加h端的一些接口 --- kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 38 insertions(+), 8 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 79a5510..2f19cfd 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,18 +1,20 @@ 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; @@ -21,9 +23,10 @@ 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; @@ -39,6 +42,8 @@ @Slf4j @Component public class UserInfoHeaderFilter extends ZuulFilter { + @Autowired + private SysDoctorService sysDoctorService; @Override public String filterType() { return FilterConstants.PRE_TYPE; @@ -54,6 +59,8 @@ return true; } + + @SneakyThrows @Override public Object run() { @@ -66,15 +73,38 @@ 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; + if(sysDoctors!=null&&sysDoctors.size()>0){ + str= sysDoctors.get(0).getDoctorName(); + hospital=sysDoctors.get(0).getHospitalId(); + } ctx.addZuulRequestHeader(SecurityConstants.USER_ID_HEADER, String.valueOf(user.getId())); 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 里面 - ctx.addZuulRequestHeader(SecurityConstants.USER_ORGS_HEADER, JSON.toJSONString(organizations)); -// log.error("用户ID写入Header成功,用户ID为:"+String.valueOf(user.getId())); + organizations.sort((e1,e2)->e1.getOrgLevel().compareTo(e2.getOrgLevel())); + if (organizations != null&&organizations.size()>0) { + 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)); + } + //将角色放到header + ctx.addZuulRequestHeader(SecurityConstants.ROLE_HEADER, JSON.toJSONString(user.getRoles())); + } @@ -84,7 +114,7 @@ //保存租户id,租户id根据业务尽进行替换 switch (clientId) { case "hospital": - tenantId = tenantId; + tenantId = tenantId; break; case "webApp": tenantId = "webApp"; @@ -101,7 +131,7 @@ ctx.addZuulRequestHeader(SecurityConstants.TENANT_HEADER, tenantId); ctx.addZuulRequestHeader(SecurityConstants.CLIENT_HEADER, clientId); - ctx.addZuulRequestHeader(SecurityConstants.ROLE_HEADER, CollectionUtil.join(authentication.getAuthorities(), ",")); + } return null; } -- Gitblit v1.8.0