Merge remote-tracking branch 'origin/dev' into dev

侯瑞军

2020-04-01 d6f4bc5820e53e0aff5b4371952922838a19304b

Merge remote-tracking branch 'origin/dev' into dev

 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);

 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>