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

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

hos-camel2/src/main/java/camel/central/archives/route/ArchivesMqRouter.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
import javax.jms.ConnectionFactory;
/**
 *  档案入库流程
 * @created Airhead 2016/8/1.
 */
@Component

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

@@ -49,26 +49,26 @@ public class GatewayProcessor implements Processor {
        Map<String, Object> params = exchange.getIn().getHeaders();
        if (params.get("appKey") == null) {
            exchange.getOut().setHeader(Exchange.HTTP_URI,"paramError");
            return "direct:errorHandle";    //TODO:
            return "direct:errorHandle";
        }
        String appKey = params.get("appKey").toString();
        String secret = getSecret(appKey);
        if (secret.equals("")) {
            exchange.getOut().setHeader(Exchange.HTTP_URI,"paramError");
            return "direct:errorHandle";    //TODO:
            return "direct:errorHandle";
        }
        boolean pass = checkParams(params);
        if (!pass) {
            exchange.getOut().setHeader(Exchange.HTTP_URI,"paramError");
            return "direct:errorHandle";    //TODO:
            return "direct:errorHandle";
        }
        pass = checkTimeStamp(params);
        if (!pass) {
            exchange.getOut().setHeader(Exchange.HTTP_URI,"outdateError");
            return "direct:errorHandle";    //TODO:
            return "direct:errorHandle";
        }
        //获取secret接口，不做sign验证
@@ -76,14 +76,14 @@ public class GatewayProcessor implements Processor {
            pass = checkSign(params, secret);
            if (!pass) {
                exchange.getOut().setHeader(Exchange.HTTP_URI,"signValidError");
                return "direct:errorHandle";    //TODO:
                return "direct:errorHandle";
            }
        }
        pass = checkAuthorized(params);
        if (!pass) {
            exchange.getOut().setHeader(Exchange.HTTP_URI,"unauthorizedError");
            return "direct:errorHandle";    //TODO:
            return "direct:errorHandle";
        }
        return genEndpoint(params, exchange);

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

@@ -69,6 +69,7 @@ public class GatewayRouterBuilder extends RouteBuilder {
                .routingSlip(method(GatewayProcessor.class, "route"))
                .to("bean:wsProcessor?method=responseWs");
        //统一网关错误代码返回
        from("direct:errorHandle")
                .choice()
                .when(header(Exchange.HTTP_URI).contains("paramError")).bean(new ErrorHandle(), "paramError")