From 64c9ab17a187d6087acbda902c01d14f5707922a Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Sun, 28 Jun 2020 16:34:36 +0800
Subject: [PATCH] 1.调整扣费业务支持feign调用 2.更新运营平台支持统一格式化时间 3.修改zuu网关，增加请求头doctorId字段，修改departmentId字段的取值
---
kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 2f19cfd..20b0e16 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
@@ -29,7 +29,6 @@
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>
@@ -82,11 +81,18 @@
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_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,URLEncoder.encode(str,"UTF-8"));//待完善
@@ -98,8 +104,8 @@
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_DEP_ID_HEADER,String.valueOf(departmentId));
+ ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_NAME_HEADER,(departmentName.equals("")?URLEncoder.encode(organizations.get(organizations.size()-1).getOrgName(),"UTF-8"):departmentName));
ctx.addZuulRequestHeader(SecurityConstants.USER_ORGS_HEADER,JSON.toJSONString(organizations));
}
//将角色放到header
--
Gitblit v1.8.0