Merge branch 'master' of http://192.168.1.220:10080/esb/esb

hos-camel2/src/main/resources/application.yml

@@ -3,4 +3,8 @@ application:
server:
  context-path: /
  port: 8001
  session-timeout:  3000
  session-timeout:  3000
---
spring:
  profiles: dev

hos-camel2/src/main/resources/logback.xml

@@ -28,10 +28,33 @@
        <appender-ref ref="queue"/>
    </logger>
    <!--<appender-ref ref="console" />-->
    <!--</logger>-->
    <root level="INFO">
        <!--<appender-ref ref="queue" />-->
        <appender-ref ref="console" />
    </root>
    <!-- 开发环境配置 -->
    <springProfile name="dev">
        <logger name="org.apache.camel" level="INFO" additivity="false">
            <appender-ref ref="queue"/>
        </logger>
        <logger name="org.hibernate" level="WARN"/>
        <logger name="org.springframework" level="WARN"/>
        <logger name="springfox.documentation" level="WARN"/>
        <root level="INFO">
            <appender-ref ref="file"/>
            <appender-ref ref="console"/>
        </root>
    </springProfile>
    <!-- 测试服务器配置 -->
    <springProfile name="test">
        <logger name="org.apache.camel" level="INFO" additivity="false">
            <appender-ref ref="queue"/>
        </logger>
        <logger name="org.hibernate" level="WARN"/>
        <logger name="org.springframework" level="WARN"/>
        <logger name="springfox.documentation" level="WARN"/>
        <root level="WARN">
            <appender-ref ref="file"/>
            <appender-ref ref="console"/>
        </root>
    </springProfile>
</configuration>

hos-docker/esb/hos-dfs/Dockerfile

@@ -0,0 +1,14 @@
FROM daocloud.io/library/java
ENV spring_profiles_active default,dev
ADD ./jar /hos-dfs
WORKDIR /hos-dfs
VOLUME /hos-dfs
EXPOSE 9010
EXPOSE 9020
#ENTRYPOINT nohup java -Djava.security.egd=file:/dev/./urandom -jar hos-dfs.jar >/dev/null 2>&1 &
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","hos-dfs.jar"]