From 9aa80dfc18e01ae2bd44b74d271b49dd365190d6 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 12 Jun 2020 15:38:24 +0800
Subject: [PATCH] FileCenter 优化上传文件

---
 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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..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,6 +1,5 @@
 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;
@@ -24,7 +23,6 @@
 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;
@@ -45,7 +43,7 @@
 @Component
 public class UserInfoHeaderFilter extends ZuulFilter {
     @Autowired
-    SysDoctorService sysDoctorService;
+    private SysDoctorService sysDoctorService;
     @Override
     public String filterType() {
         return FilterConstants.PRE_TYPE;
@@ -83,13 +81,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 +104,7 @@
                 }
                 //将角色放到header
                 ctx.addZuulRequestHeader(SecurityConstants.ROLE_HEADER, JSON.toJSONString(user.getRoles()));
-                tenantId=String.valueOf(organizations.get(0).getId());
+
             }
 
 

--
Gitblit v1.8.0