Ver código fonte

冲突解决

huangzhiyong 8 anos atrás
pai
commit
47d57f1c8b
45 arquivos alterados com 207 adições e 204 exclusões
  1. 1 1
      hos-broker/src/main/java/com/yihu/hos/broker/controllers/GatewayController.java
  2. 30 1
      hos-camel2/src/main/java/camel/HosCamelApplication.java
  3. 0 54
      hos-camel2/src/main/java/camel/api7/route/CxfConsumerTest.java
  4. 1 1
      hos-camel2/src/main/java/camel/gateway/processor/ApiParam.java
  5. 1 1
      hos-camel2/src/main/java/camel/gateway/processor/AppApi.java
  6. 1 1
      hos-camel2/src/main/java/camel/gateway/processor/ErrorHandle.java
  7. 1 1
      hos-camel2/src/main/java/camel/gateway/processor/GatewayProcessor.java
  8. 1 1
      hos-camel2/src/main/java/camel/gateway/processor/ParamVerifyBean.java
  9. 1 1
      hos-camel2/src/main/java/camel/gateway/processor/SignProcessor.java
  10. 1 1
      hos-camel2/src/main/java/camel/gateway/processor/WsProcessor.java
  11. 1 1
      hos-camel2/src/main/java/camel/gateway/processor/WsService.java
  12. 51 0
      hos-camel2/src/main/java/camel/central/gateway/route/GatewayRouterBuilder.java
  13. 18 0
      hos-camel2/src/main/java/camel/central/gateway/route/GatewayToolBuilder.java
  14. 2 2
      hos-camel2/src/main/java/camel/qlc/processor/Processor0.java
  15. 1 1
      hos-camel2/src/main/java/camel/qlc/processor/Processor1.java
  16. 1 1
      hos-camel2/src/main/java/camel/qlc/processor/Processor2.java
  17. 6 6
      hos-camel2/src/main/java/camel/qlc/route/QlcRouteBulider.java
  18. 1 1
      hos-camel2/src/main/java/camel/api1/processor/ApiProcessor.java
  19. 3 3
      hos-camel2/src/main/java/camel/api1/route/ApiRouteBulider.java
  20. 1 1
      hos-camel2/src/main/java/camel/api7/processor/ApiProcessor.java
  21. 1 1
      hos-camel2/src/main/java/camel/api7/processor/TestClient.java
  22. 1 1
      hos-camel2/src/main/java/camel/api7/processor/TestWService.java
  23. 1 1
      hos-camel2/src/main/java/camel/api7/processor/TestWsConfig.java
  24. 1 1
      hos-camel2/src/main/java/camel/api7/processor/ToWsProcessor.java
  25. 3 3
      hos-camel2/src/main/java/camel/api7/route/ApiRouteBulider.java
  26. 34 0
      hos-camel2/src/main/java/camel/demo/api7/route/CxfConsumerTest.java
  27. 1 1
      hos-camel2/src/main/java/camel/collect/processor/CollectProcessor0.java
  28. 2 2
      hos-camel2/src/main/java/camel/collect/route/CollectQuartzRoute.java
  29. 1 1
      hos-camel2/src/main/java/camel/quartz2/processor/Quartz2Processor.java
  30. 2 2
      hos-camel2/src/main/java/camel/quartz2/route/Quartz2Route.java
  31. 0 84
      hos-camel2/src/main/java/camel/gateway/route/GatewayRouterBuilder.java
  32. 1 1
      hos-camel2/src/main/java/camel/crawler/processor/Aggregate.java
  33. 1 1
      hos-camel2/src/main/java/camel/crawler/processor/AggregateProcessor.java
  34. 1 1
      hos-camel2/src/main/java/camel/crawler/processor/DefaultHttpProcessor.java
  35. 1 1
      hos-camel2/src/main/java/camel/crawler/processor/HttpProcessor.java
  36. 1 1
      hos-camel2/src/main/java/camel/crawler/processor/Split.java
  37. 2 2
      hos-camel2/src/main/java/camel/crawler/route/CrawlerQuartzRoute.java
  38. 6 6
      hos-camel2/src/main/java/camel/crawler/route/CrawlerRouteBulider.java
  39. 2 2
      hos-camel2/src/main/java/camel/crawler/route/QuartzRoute.java
  40. 5 5
      hos-camel2/src/main/java/camel/crawler/route/RouteBulider1.java
  41. 1 1
      hos-camel2/src/main/java/camel/qcrule/processor/PatientProcessor.java
  42. 1 1
      hos-camel2/src/main/java/camel/qcrule/processor/QcHttpProcessor.java
  43. 4 4
      hos-camel2/src/main/java/camel/qcrule/router/QcCrawlerRoute.java
  44. 10 1
      hos-camel2/src/main/resources/application.yml
  45. 1 1
      src/main/resources/config/http.properties

+ 1 - 1
hos-broker/src/main/java/com/yihu/hos/broker/controllers/GatewayController.java

@ -25,7 +25,7 @@ public class GatewayController {
        this.gatewayService = gatewayService;
    }
    @RequestMapping(value = "/camel.gateway", method = RequestMethod.POST)
    @RequestMapping(value = "/camel.central.gateway", method = RequestMethod.POST)
    public void transfer(HttpServletRequest request, HttpServletResponse response) throws Exception {
        request.setCharacterEncoding("UTF-8");
        response.setContentType("application/json;charset=UTF-8");

+ 30 - 1
hos-camel2/src/main/java/camel/HosCamelApplication.java

@ -1,5 +1,11 @@
package camel;
import camel.log.TracerFormatter;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.processor.interceptor.Tracer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -8,9 +14,32 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 */
@SpringBootApplication
//@EnableEurekaClient
public class HosCamelApplication {
public class HosCamelApplication implements CommandLineRunner {
    @Autowired
    private CamelContext context;
    public static void main(String[] args) {
        SpringApplication.run(HosCamelApplication.class, args);
    }
    @Override
    public void run(String... strings) throws Exception {
        context.setUseMDCLogging(true);
        context.setTracing(true);
        Tracer tracer = new Tracer();
        TracerFormatter formatter = new TracerFormatter();
        formatter.setShowHeaders(true);
        formatter.setShowBody(true);
        formatter.setShowBodyType(true);
        formatter.setShowOutHeaders(true);
        formatter.setShowOutBody(true);
        formatter.setShowOutBodyType(true);
        tracer.setFormatter(formatter);
        context.addInterceptStrategy(tracer);
        context.getProperties().put(Exchange.LOG_DEBUG_BODY_STREAMS, "true");
        context.getProperties().put(Exchange.BEAN_MULTI_PARAMETER_ARRAY, "true");
    }
}

+ 0 - 54
hos-camel2/src/main/java/camel/api7/route/CxfConsumerTest.java

@ -1,54 +0,0 @@
package camel.api7.route;
import camel.api7.processor.ToWsProcessor;
import camel.gateway.processor.GatewayProcessor;
import camel.log.TracerFormatter;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.interceptor.Tracer;
import org.springframework.stereotype.Component;
@Component
public class CxfConsumerTest extends RouteBuilder {
    protected static final String SIMPLE_ENDPOINT_ADDRESS = "http://127.0.0.1:4445/soap/ws";
    protected static final String SIMPLE_ENDPOINT_URI = "cxf:" + SIMPLE_ENDPOINT_ADDRESS
            + "?serviceClass=camel.api7.processor.TestWService"
//            + "&dataFormat=CXF_MESSAGE"
            ;
    // START SNIPPET: example
    public void configure() {
        this.getContext().setUseMDCLogging(true);
        this.getContext().setTracing(true);
        Tracer tracer = new Tracer();
        TracerFormatter formatter = new TracerFormatter();
        formatter.setShowHeaders(true);
        formatter.setShowBody(true);
        formatter.setShowBodyType(true);
        formatter.setShowOutHeaders(true);
        formatter.setShowOutBody(true);
        formatter.setShowOutBodyType(true);
        formatter.setMultiline(true);
        tracer.setFormatter(formatter);
        this.getContext().addInterceptStrategy(tracer);
        this.getContext().getProperties().put(Exchange.LOG_DEBUG_BODY_STREAMS, "true");
        this.getContext().getProperties().put(Exchange.BEAN_MULTI_PARAMETER_ARRAY, "true");
        from(SIMPLE_ENDPOINT_URI)
                .setHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY, constant(true))
                .process(new ToWsProcessor())
                .routingSlip(method(GatewayProcessor.class, "route"))
                .to("bean:toWsProcessor?method=responseWs")
        ;
    }
};

+ 1 - 1
hos-camel2/src/main/java/camel/gateway/processor/ApiParam.java

@ -1,4 +1,4 @@
package camel.gateway.processor;
package camel.central.gateway.processor;
/**
 * @author Airhead

+ 1 - 1
hos-camel2/src/main/java/camel/gateway/processor/AppApi.java

@ -1,4 +1,4 @@
package camel.gateway.processor;
package camel.central.gateway.processor;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

+ 1 - 1
hos-camel2/src/main/java/camel/gateway/processor/ErrorHandle.java

@ -1,4 +1,4 @@
package camel.gateway.processor;
package camel.central.gateway.processor;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.Exchange;

+ 1 - 1
hos-camel2/src/main/java/camel/gateway/processor/GatewayProcessor.java

@ -1,4 +1,4 @@
package camel.gateway.processor;
package camel.central.gateway.processor;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

+ 1 - 1
hos-camel2/src/main/java/camel/gateway/processor/ParamVerifyBean.java

@ -1,4 +1,4 @@
package camel.gateway.processor;
package camel.central.gateway.processor;
import com.yihu.hos.core.encrypt.MD5;

+ 1 - 1
hos-camel2/src/main/java/camel/gateway/processor/SignProcessor.java

@ -1,4 +1,4 @@
package camel.gateway.processor;
package camel.central.gateway.processor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.hos.core.datatype.StringUtil;

+ 1 - 1
hos-camel2/src/main/java/camel/gateway/processor/WsProcessor.java

@ -1,4 +1,4 @@
package camel.gateway.processor;
package camel.central.gateway.processor;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;

+ 1 - 1
hos-camel2/src/main/java/camel/gateway/processor/WsService.java

@ -1,4 +1,4 @@
package camel.gateway.processor;
package camel.central.gateway.processor;
import javax.jws.WebMethod;
import javax.jws.WebParam;

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

@ -0,0 +1,51 @@
package camel.central.gateway.route;
import camel.central.gateway.processor.ErrorHandle;
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.springframework.stereotype.Component;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2017/3/13.
 */
@Component
public class GatewayRouterBuilder extends RouteBuilder {
    protected static final String SIMPLE_ENDPOINT_ADDRESS = "http://0.0.0.0:3333/ws/api";
    protected static final String SIMPLE_ENDPOINT_URI = "cxf:" + SIMPLE_ENDPOINT_ADDRESS
            + "?serviceClass=camel.central.gateway.processor.WsService"
//            + "&dataFormat=CXF_MESSAGE"
            ;
    @Override
    public void configure() throws Exception {
        from("jetty:http://0.0.0.0:9998?matchOnUriPrefix=true").routeId("proxy")
                .to("jetty:http://192.168.1.221:10000?bridgeEndpoint=true&throwExceptionOnFailure=false");
        from("jetty:http://0.0.0.0:9999/api").routeId("api")
                .process(new GatewayProcessor())
                .routingSlip(method(GatewayProcessor.class, "route"));
        from("direct:errorHandle")
                .choice()
                .when(header(Exchange.HTTP_URI).contains("paramError")).bean(new ErrorHandle(), "paramError")
                .when(header(Exchange.HTTP_URI).contains("outdateError")).bean(new ErrorHandle(), "outdateError")
                .when(header(Exchange.HTTP_URI).contains("signValidError")).bean(new ErrorHandle(), "signValidError")
                .when(header(Exchange.HTTP_URI).contains("unauthorizedError")).bean(new ErrorHandle(), "unauthorizedError")
                .endChoice();
        from("jetty:http://0.0.0.0:9999/healthy").routeId("healthy")
                .log("=========================心跳测试=====================");
        from(SIMPLE_ENDPOINT_URI)
                .setHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY, constant(true))
                .process(new WsProcessor())
                .routingSlip(method(GatewayProcessor.class, "route"))
                .to("bean:wsProcessor?method=responseWs");
    }
}

+ 18 - 0
hos-camel2/src/main/java/camel/central/gateway/route/GatewayToolBuilder.java

@ -0,0 +1,18 @@
package camel.central.gateway.route;
import camel.central.gateway.processor.SignProcessor;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.stereotype.Component;
/**
 * 网关辅助工具路由,用于生成签名等内容。不要要发布到生产环境中。
 * Created by l4qiang on 2017-06-13.
 */
@Component
public class GatewayToolBuilder extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://0.0.0.0:9999/sign").routeId("sign")
                .process(new SignProcessor());
    }
}

+ 2 - 2
hos-camel2/src/main/java/camel/qlc/processor/Processor0.java

@ -1,4 +1,4 @@
package camel.qlc.processor;
package camel.central.qlc.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
@ -12,7 +12,7 @@ public class Processor0 implements Processor {
    public void process(Exchange exchange) throws Exception {
        Message outMessage = exchange.getOut();
        HttpMessage inMessage = (HttpMessage) exchange.getIn();
        String queryString = "api=camel.qlc&param=" + inMessage.getRequest().getParameterValues("data")[0];
        String queryString = "api=camel.central.qlc&param=" + inMessage.getRequest().getParameterValues("data")[0];
        outMessage.setHeader(Exchange.HTTP_QUERY, queryString);
    }

+ 1 - 1
hos-camel2/src/main/java/camel/qlc/processor/Processor1.java

@ -1,4 +1,4 @@
package camel.qlc.processor;
package camel.central.qlc.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

+ 1 - 1
hos-camel2/src/main/java/camel/qlc/processor/Processor2.java

@ -1,4 +1,4 @@
package camel.qlc.processor;
package camel.central.qlc.processor;
import net.sf.json.JSONObject;
import org.apache.camel.Exchange;

+ 6 - 6
hos-camel2/src/main/java/camel/qlc/route/QlcRouteBulider.java

@ -1,9 +1,9 @@
package camel.qlc.route;
package camel.central.qlc.route;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import camel.qlc.processor.Processor1;
import camel.qlc.processor.Processor2;
import camel.central.qlc.processor.Processor1;
import camel.central.qlc.processor.Processor2;
/**
 * Created by lingfeng on 2016/7/25.
@ -12,11 +12,11 @@ public class QlcRouteBulider extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http4://172.17.110.178:9088/camel.qlc").routeId("camel/qlc")
        from("jetty:http4://172.17.110.178:9088/camel.central.qlc").routeId("camel/central/qlc")
                .process(new Processor1()).setHeader(Exchange.HTTP_METHOD, constant("POST")).log("servers: 3,code: queryUserInfo,order: 1")
                .to("http4://172.19.103.89:8088/api/v1.0/camel.qlc/queryUserInfo").log("servers: 3,code: queryUserInfo,order: 1")
                .to("http4://172.19.103.89:8088/api/v1.0/camel.central.qlc/queryUserInfo").log("servers: 3,code: queryUserInfo,order: 1")
                .process(new Processor2()).setHeader(Exchange.HTTP_METHOD, constant("POST")).log("servers: 3,code: patientInformation,order: 1")
                .to("http4://172.19.103.89:8088/api/v1.0/camel.qlc/patientInformation").log("servers: 3,code: patientInformation,order: 1")
                .to("http4://172.19.103.89:8088/api/v1.0/camel.central.qlc/patientInformation").log("servers: 3,code: patientInformation,order: 1")
                .process(new Processor2()).setHeader(Exchange.HTTP_METHOD, constant("POST")).to("stream:out"); // 2. 为路由配置组件或终端节点.
    }
}

+ 1 - 1
hos-camel2/src/main/java/camel/api1/processor/ApiProcessor.java

@ -1,4 +1,4 @@
package camel.api1.processor;
package camel.demo.api1.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

+ 3 - 3
hos-camel2/src/main/java/camel/api1/route/ApiRouteBulider.java

@ -1,13 +1,13 @@
package camel.api1.route;
package camel.demo.api1.route;
import camel.api1.processor.ApiProcessor;
import camel.demo.api1.processor.ApiProcessor;
import org.apache.camel.builder.RouteBuilder;
public class ApiRouteBulider extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://0.0.0.0:9097/api/v7").routeId("camel/api1")
        from("jetty:http://0.0.0.0:9097/api/v7").routeId("camel/demo/api1")
                .process(new ApiProcessor()).log("servers: 0,code: ,order: 0").log("servers: 0,code: ,order: 0");
        from("jetty:http://0.0.0.0:9097/rest").routeId("restTest")

+ 1 - 1
hos-camel2/src/main/java/camel/api7/processor/ApiProcessor.java

@ -1,4 +1,4 @@
package camel.api7.processor;
package camel.demo.api7.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

+ 1 - 1
hos-camel2/src/main/java/camel/api7/processor/TestClient.java

@ -1,4 +1,4 @@
package camel.api7.processor;
package camel.demo.api7.processor;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;

+ 1 - 1
hos-camel2/src/main/java/camel/api7/processor/TestWService.java

@ -1,4 +1,4 @@
package camel.api7.processor;
package camel.demo.api7.processor;
import javax.jws.WebMethod;
import javax.jws.WebParam;

+ 1 - 1
hos-camel2/src/main/java/camel/api7/processor/TestWsConfig.java

@ -1,4 +1,4 @@
package camel.api7.processor;
package camel.demo.api7.processor;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBus;

+ 1 - 1
hos-camel2/src/main/java/camel/api7/processor/ToWsProcessor.java

@ -1,4 +1,4 @@
package camel.api7.processor;
package camel.demo.api7.processor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;

+ 3 - 3
hos-camel2/src/main/java/camel/api7/route/ApiRouteBulider.java

@ -1,13 +1,13 @@
package camel.api7.route;
package camel.demo.api7.route;
import camel.api7.processor.ApiProcessor;
import camel.demo.api7.processor.ApiProcessor;
import org.apache.camel.builder.RouteBuilder;
public class ApiRouteBulider extends RouteBuilder {
    @Override
    public void configure() throws Exception {
        from("jetty:http://0.0.0.0:9097/api/v1").routeId("camel/api7")
        from("jetty:http://0.0.0.0:9097/api/v1").routeId("camel/demo/api7")
                .process(new ApiProcessor()).log("servers: 0,code: ,order: 0").log("servers: 0,code: ,order: 0");
    }
}

+ 34 - 0
hos-camel2/src/main/java/camel/demo/api7/route/CxfConsumerTest.java

@ -0,0 +1,34 @@
package camel.demo.api7.route;
import camel.demo.api7.processor.ToWsProcessor;
import camel.central.gateway.processor.GatewayProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.stereotype.Component;
@Component
public class CxfConsumerTest extends RouteBuilder {
    protected static final String SIMPLE_ENDPOINT_ADDRESS = "http://127.0.0.1:4445/soap/ws";
    protected static final String SIMPLE_ENDPOINT_URI = "cxf:" + SIMPLE_ENDPOINT_ADDRESS
            + "?serviceClass=camel.demo.api7.processor.TestWService"
//            + "&dataFormat=CXF_MESSAGE"
            ;
    // START SNIPPET: example
    public void configure() {
        from(SIMPLE_ENDPOINT_URI)
                .setHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY, constant(true))
                .process(new ToWsProcessor())
                .routingSlip(method(GatewayProcessor.class, "route"))
                .to("bean:toWsProcessor?method=responseWs")
        ;
    }
};

+ 1 - 1
hos-camel2/src/main/java/camel/collect/processor/CollectProcessor0.java

@ -1,4 +1,4 @@
package camel.collect.processor;
package camel.demo.collect.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

+ 2 - 2
hos-camel2/src/main/java/camel/collect/route/CollectQuartzRoute.java

@ -1,6 +1,6 @@
package camel.collect.route;
package camel.demo.collect.route;
import camel.collect.processor.CollectProcessor0;
import camel.demo.collect.processor.CollectProcessor0;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;

+ 1 - 1
hos-camel2/src/main/java/camel/quartz2/processor/Quartz2Processor.java

@ -1,4 +1,4 @@
package camel.quartz2.processor;
package camel.demo.quartz2.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

+ 2 - 2
hos-camel2/src/main/java/camel/quartz2/route/Quartz2Route.java

@ -1,6 +1,6 @@
package camel.quartz2.route;
package camel.demo.quartz2.route;
import camel.quartz2.processor.Quartz2Processor;
import camel.demo.quartz2.processor.Quartz2Processor;
import org.apache.camel.builder.RouteBuilder;
public class Quartz2Route  extends RouteBuilder {

+ 0 - 84
hos-camel2/src/main/java/camel/gateway/route/GatewayRouterBuilder.java

@ -1,84 +0,0 @@
package camel.gateway.route;
import camel.gateway.processor.ErrorHandle;
import camel.gateway.processor.GatewayProcessor;
import camel.gateway.processor.SignProcessor;
import camel.log.TracerFormatter;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.interceptor.Tracer;
import org.springframework.stereotype.Component;
/**
 * @author HZY
 * @vsrsion 1.0
 * Created at 2017/3/13.
 */
@Component
public class GatewayRouterBuilder extends RouteBuilder {
    protected static final String SIMPLE_ENDPOINT_ADDRESS = "http://0.0.0.0:3333/ws/api";
    protected static final String SIMPLE_ENDPOINT_URI = "cxf:" + SIMPLE_ENDPOINT_ADDRESS
            + "?serviceClass=camel.gateway.processor.WsService"
//            + "&dataFormat=CXF_MESSAGE"
            ;
    @Override
    public void configure() throws Exception {
        this.getContext().setUseMDCLogging(true);
        this.getContext().setTracing(true);
        Tracer tracer = new Tracer();
//        DefaultTraceFormatter formatter = new DefaultTraceFormatter();
        TracerFormatter formatter = new TracerFormatter();
        formatter.setShowHeaders(true);
        formatter.setShowBody(true);
        formatter.setShowBodyType(true);
        formatter.setShowOutHeaders(true);
        formatter.setShowOutBody(true);
        formatter.setShowOutBodyType(true);
        tracer.setFormatter(formatter);
        this.getContext().addInterceptStrategy(tracer);
        this.getContext().getProperties().put(Exchange.LOG_DEBUG_BODY_STREAMS, "true");
        this.getContext().getProperties().put(Exchange.BEAN_MULTI_PARAMETER_ARRAY, "true");
        from("jetty:http://0.0.0.0:9998?matchOnUriPrefix=true").routeId("proxy")
                .to("jetty:http://192.168.1.221:10000?bridgeEndpoint=true&throwExceptionOnFailure=false");
        from("jetty:http://0.0.0.0:9999/api").routeId("api")
                .process(new GatewayProcessor())
                .routingSlip(method(GatewayProcessor.class, "route"));
        from("direct:errorHandle")
                .choice()
                .when(header(Exchange.HTTP_URI).contains("paramError")).bean(new ErrorHandle(), "paramError")
                .when(header(Exchange.HTTP_URI).contains("outdateError")).bean(new ErrorHandle(), "outdateError")
                .when(header(Exchange.HTTP_URI).contains("signValidError")).bean(new ErrorHandle(), "signValidError")
                .when(header(Exchange.HTTP_URI).contains("unauthorizedError")).bean(new ErrorHandle(), "unauthorizedError")
                .endChoice();
//
//        from("jetty:http://0.0.0.0:9996/error/{error}")
//                .choice()
//                .when(header(Exchange.HTTP_URI).contains("paramError")).bean(new ErrorHandle(), "paramError")
//                .when(header(Exchange.HTTP_URI).contains("outdateError")).bean(new ErrorHandle(), "outdateError")
//                .when(header(Exchange.HTTP_URI).contains("signValidError")).bean(new ErrorHandle(), "signValidError")
//                .when(header(Exchange.HTTP_URI).contains("unauthorizedError")).bean(new ErrorHandle(), "unauthorizedError")
//                .endChoice();
        from("jetty:http://0.0.0.0:9999/healthy").routeId("healthy")
                .log("=========================心跳测试=====================");
        from("jetty:http://0.0.0.0:9999/sign").routeId("sign")
                .process(new SignProcessor());
//        from(SIMPLE_ENDPOINT_URI)
//                .setHeader(Exchange.BEAN_MULTI_PARAMETER_ARRAY, constant(true))
//                .process(new WsProcessor())
//                .routingSlip(method(GatewayProcessor.class, "route"))
//        .to("bean:wsProcessor?method=responseWs")
        ;
    }
}

+ 1 - 1
hos-camel2/src/main/java/camel/crawler/processor/Aggregate.java

@ -1,4 +1,4 @@
package camel.crawler.processor;
package camel.terminal.crawler.processor;
import org.apache.camel.Exchange;
import org.apache.camel.processor.aggregate.AggregationStrategy;

+ 1 - 1
hos-camel2/src/main/java/camel/crawler/processor/AggregateProcessor.java

@ -1,4 +1,4 @@
package camel.crawler.processor;
package camel.terminal.crawler.processor;
import net.sf.json.JSONObject;
import org.apache.camel.Exchange;

+ 1 - 1
hos-camel2/src/main/java/camel/crawler/processor/DefaultHttpProcessor.java

@ -1,4 +1,4 @@
package camel.crawler.processor;
package camel.terminal.crawler.processor;
import com.yihu.hos.core.datatype.StringUtil;
import net.sf.json.JSONObject;

+ 1 - 1
hos-camel2/src/main/java/camel/crawler/processor/HttpProcessor.java

@ -1,4 +1,4 @@
package camel.crawler.processor;
package camel.terminal.crawler.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

+ 1 - 1
hos-camel2/src/main/java/camel/crawler/processor/Split.java

@ -1,4 +1,4 @@
package camel.crawler.processor;
package camel.terminal.crawler.processor;
import net.sf.json.JSONArray;
import org.apache.camel.Body;

+ 2 - 2
hos-camel2/src/main/java/camel/crawler/route/CrawlerQuartzRoute.java

@ -1,6 +1,6 @@
package camel.crawler.route;
package camel.terminal.crawler.route;
import camel.crawler.processor.DefaultHttpProcessor;
import camel.terminal.crawler.processor.DefaultHttpProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;

+ 6 - 6
hos-camel2/src/main/java/camel/crawler/route/CrawlerRouteBulider.java

@ -1,6 +1,6 @@
package camel.crawler.route;
package camel.terminal.crawler.route;
import camel.crawler.processor.DefaultHttpProcessor;
import camel.terminal.crawler.processor.DefaultHttpProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
@ -14,18 +14,18 @@ public class CrawlerRouteBulider extends RouteBuilder {
        from("jetty:http://192.168.131.96:8066/crawlerPull").routeId("crawlerPull")
                .process(new DefaultHttpProcessor("{\"jobId\":\"5ad5c11655d443c30155d477a6b10000\"}")).setHeader(Exchange.HTTP_METHOD, constant("POST"))
                .to("http://192.168.131.96:8088/camel.crawler/patientList");
                .to("http://192.168.131.96:8088/camel.terminal.crawler/patientList");
        from("jetty:http://192.168.131.96:8066/crawlerPush").routeId("crawlerPush")
                .process(new DefaultHttpProcessor("{\"jobId\":\"5ad5c11655d443c30155d477a6b10000\"}")).setHeader(Exchange.HTTP_METHOD, constant("POST"))
                .to("http://192.168.131.96:8088/camel.crawler/patient");
                .to("http://192.168.131.96:8088/camel.terminal.crawler/patient");
        from("jetty:http://192.168.131.96:8066/crawlerFlowPull").routeId("crawlerFlowPull")
                .process(new DefaultHttpProcessor("{\"jobId\":\"5ad5c11655d443c30155d477a6b10000\"}")).setHeader(Exchange.HTTP_METHOD, constant("POST"))
                .to("http://192.168.131.96:8088/camel.crawler/patientListFlow");
                .to("http://192.168.131.96:8088/camel.terminal.crawler/patientListFlow");
        from("jetty:http://192.168.131.96:8066/crawlerFlowPush").routeId("crawlerFlowPush")
                .process(new DefaultHttpProcessor("{\"jobId\":\"5ad5c11655d443c30155d477a6b10000\"}")).setHeader(Exchange.HTTP_METHOD, constant("POST"))
                .to("http://192.168.131.96:8088/camel.crawler/patientFlow");
                .to("http://192.168.131.96:8088/camel.terminal.crawler/patientFlow");
    }
}

+ 2 - 2
hos-camel2/src/main/java/camel/crawler/route/QuartzRoute.java

@ -1,6 +1,6 @@
package camel.crawler.route;
package camel.terminal.crawler.route;
import camel.crawler.processor.DefaultHttpProcessor;
import camel.terminal.crawler.processor.DefaultHttpProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;

+ 5 - 5
hos-camel2/src/main/java/camel/crawler/route/RouteBulider1.java

@ -1,9 +1,9 @@
package camel.crawler.route;
package camel.terminal.crawler.route;
import camel.crawler.processor.Aggregate;
import camel.crawler.processor.AggregateProcessor;
import camel.crawler.processor.HttpProcessor;
import camel.crawler.processor.Split;
import camel.terminal.crawler.processor.Aggregate;
import camel.terminal.crawler.processor.AggregateProcessor;
import camel.terminal.crawler.processor.HttpProcessor;
import camel.terminal.crawler.processor.Split;
import org.apache.camel.builder.RouteBuilder;
/**

+ 1 - 1
hos-camel2/src/main/java/camel/qcrule/processor/PatientProcessor.java

@ -1,4 +1,4 @@
package camel.qcrule.processor;
package camel.terminal.qcrule.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;

+ 1 - 1
hos-camel2/src/main/java/camel/qcrule/processor/QcHttpProcessor.java

@ -1,4 +1,4 @@
package camel.qcrule.processor;
package camel.terminal.qcrule.processor;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

+ 4 - 4
hos-camel2/src/main/java/camel/qcrule/router/QcCrawlerRoute.java

@ -1,8 +1,8 @@
package camel.qcrule.router;
package camel.terminal.qcrule.router;
import camel.crawler.processor.Split;
import camel.qcrule.processor.PatientProcessor;
import camel.qcrule.processor.QcHttpProcessor;
import camel.terminal.crawler.processor.Split;
import camel.terminal.qcrule.processor.PatientProcessor;
import camel.terminal.qcrule.processor.QcHttpProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.stereotype.Component;

+ 10 - 1
hos-camel2/src/main/resources/application.yml

@ -11,4 +11,13 @@ spring:
eureka:
  client:
    serviceUrl:
      defaultZone: http://192.168.1.221:8761/eureka/
      defaultZone: http://192.168.1.221:8761/eureka/
  data:
    mongodb:
      host: 172.19.103.57
      port: 27017
      username: esb
      password: esb
      authenticationDatabase: admin
      database: log
      gridFsDatabase: dfs

+ 1 - 1
src/main/resources/config/http.properties

@ -10,5 +10,5 @@ sslPassword = 123456
clientId = 1FtXTrSL8D
clientKey = MUZ0WFRyU0w4RDp1c3ZOeWxWc0ZvdFVlQ2tE
httpGateway=http://192.168.131.6:8081/camel.gateway/transfer
httpGateway=http://192.168.131.6:8081/camel.central.gateway/transfer