From d6f4bc5820e53e0aff5b4371952922838a19304b Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Wed, 01 Apr 2020 18:33:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java | 4 ++++
pom.xml | 5 +++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java b/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java
index dbc03be..b6caf75 100644
--- a/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java
+++ b/kidgrow-commons/kidgrow-ribbon-spring-boot-starter/src/main/java/com/kidgrow/ribbon/config/FeignHttpInterceptorConfig.java
@@ -31,6 +31,10 @@
public void initialize() {
requestHeaders.add(SecurityConstants.USER_ID_HEADER);
requestHeaders.add(SecurityConstants.USER_HEADER);
+ requestHeaders.add(SecurityConstants.USER_DEP_ID_HEADER);
+ requestHeaders.add(SecurityConstants.USER_DEP_NAME_HEADER);
+ requestHeaders.add(SecurityConstants.USER_ORG_ID_HEADER);
+ requestHeaders.add(SecurityConstants.USER_ORG_NAME_HEADER);
requestHeaders.add(SecurityConstants.ROLE_HEADER);
requestHeaders.add(SecurityConstants.CLIENT_HEADER);
requestHeaders.add(SecurityConstants.TENANT_HEADER);
diff --git a/pom.xml b/pom.xml
index c9d7c7a..2b7b5ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -156,6 +156,11 @@
<version>${javax.activatio.version}</version>
</dependency>
<!-- jaxb模块引用 - end -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-devtools</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<dependencyManagement>
--
Gitblit v1.8.0