From fc223b26f87f7a221b38084bb62d8047974bbf1c Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Sun, 26 Apr 2020 12:42:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java | 16 +++++++++++-----
1 files changed, 11 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 79a5510..121789a 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
@@ -71,10 +71,16 @@
ctx.addZuulRequestHeader(SecurityConstants.USER_HEADER, user.getUsername());
ctx.addZuulRequestHeader(SecurityConstants.USER_REAL_NAME, "");//待完善
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()));
+ 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()));
+ tenantId=String.valueOf(organizations.get(0).getId());
}
@@ -84,7 +90,7 @@
//保存租户id,租户id根据业务尽进行替换
switch (clientId) {
case "hospital":
- tenantId = tenantId;
+ tenantId = tenantId;
break;
case "webApp":
tenantId = "webApp";
@@ -101,7 +107,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