From 83715ed7019ab37a4611a2e4e506f84aa1f7b1b0 Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Tue, 28 Apr 2020 15:43:13 +0800
Subject: [PATCH] 增加feign客户端调用排除 tenant的注解。 修改完善诊断记录查看的细节问题

---
 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 7d7bb36..dbfa95e 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
@@ -83,13 +83,17 @@
 
                 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,str);//待完善
+                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()));
@@ -102,7 +106,7 @@
                 }
                 //将角色放到header
                 ctx.addZuulRequestHeader(SecurityConstants.ROLE_HEADER, JSON.toJSONString(user.getRoles()));
-                tenantId=String.valueOf(organizations.get(0).getId());
+
             }
 
 

--
Gitblit v1.8.0