Merge branch 'master' of http://192.168.1.220:10080/CoSharp/eip

hos-camel2/src/main/java/camel/central/gateway/route/GatewayRouterBuilder.java

@@ -5,6 +5,11 @@ import camel.central.gateway.processor.GatewayProcessor;
import camel.central.gateway.processor.WsProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jetty.JettyHttpComponent;
import org.apache.camel.util.jsse.KeyManagersParameters;
import org.apache.camel.util.jsse.KeyStoreParameters;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/**
@@ -20,22 +25,28 @@ public class GatewayRouterBuilder extends RouteBuilder {
//            + "&dataFormat=CXF_MESSAGE"
            ;
    @Value("${hos.https.enable}")
    private Boolean httpsEnable;
    @Override
    public void configure() throws Exception {
        //全局ssl设置
//        KeyStoreParameters ksparams = new KeyStoreParameters();
//        ksparams.setResource("D:/tomcat.keystore");
//        ksparams.setPassword("123456");
//
//        KeyManagersParameters kmp = new KeyManagersParameters();
//        kmp.setKeyStore(ksparams);
//        kmp.setKeyPassword("123456");
//
//        SSLContextParameters scp = new SSLContextParameters();
//        scp.setKeyManagers(kmp);
//
//        JettyHttpComponent jettyComponent = getContext().getComponent("jetty", JettyHttpComponent.class);
//        jettyComponent.setSslContextParameters(scp);
        if (httpsEnable) {
            //全局ssl设置
            KeyStoreParameters ksparams = new KeyStoreParameters();
            ksparams.setResource("tomcat.keystore");
            ksparams.setPassword("123456");
            KeyManagersParameters kmp = new KeyManagersParameters();
            kmp.setKeyStore(ksparams);
            kmp.setKeyPassword("123456");
            SSLContextParameters scp = new SSLContextParameters();
            scp.setKeyManagers(kmp);
            JettyHttpComponent jettyComponent = getContext().getComponent("jetty", JettyHttpComponent.class);
            jettyComponent.setSslContextParameters(scp);
        }
        //EHR ag-admin网关代理
        from("jetty:http://0.0.0.0:9998?matchOnUriPrefix=true").routeId("proxy")

hos-camel2/src/main/java/camel/monitor/processor/ServiceMonitorService.java

@@ -51,8 +51,8 @@ public class ServiceMonitorService {
            }
            DateFormat df = new SimpleDateFormat("EEE MMM dd yyyy HH:mm:ss z", Locale.ENGLISH);
            begin = DateUtil.formatCharDateYMDHMS("2017-06-12 00:00:00");
            end = DateUtil.formatCharDateYMDHMS("2017-06-20 00:00:00");
//            begin = DateUtil.formatCharDateYMDHMS("2017-06-12 00:00:00");
//            end = DateUtil.formatCharDateYMDHMS("2017-06-20 00:00:00");
            String beginTime = df.format(begin);
            String endTime = df.format(end);

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

@@ -24,4 +24,8 @@ spring:
eureka:
  client:
    serviceUrl:
      defaultZone: http://192.168.1.221:8761/eureka/
      defaultZone: http://192.168.1.221:8761/eureka/
hos:
  https:
    enable: false

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

@@ -17,7 +17,7 @@
        <InitialContextFactoryName>
            org.apache.activemq.jndi.ActiveMQInitialContextFactory
        </InitialContextFactoryName>
        <ProviderURL>tcp://172.19.103.42:61616</ProviderURL>
        <ProviderURL>tcp://172.19.103.57:61616</ProviderURL>
        <userName>admin</userName>
        <password>admin</password>
        <TopicConnectionFactoryBindingName>ConnectionFactory</TopicConnectionFactoryBindingName>

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

@@ -16,7 +16,7 @@ camel:
spring:
  profiles: dev
  activemq:
      broker-url: tcp://172.19.103.42:61616
      broker-url: tcp://172.19.103.57:61616
      user: admin
      password: admin
  data: