Merge branch 'master' of luofaqiang/eip into master

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

@@ -84,7 +84,7 @@ public class ServiceMonitorService {
        document = document.append("reduce", reduceFunc);
        String query = "{fireTime:{$gte:new Date(\"" + beginTime + "\"), $lt:new Date(\"" + endTime + "\")}}";
        document = document.append("query", Document.parse(query));
        document = document.append("out", SERVICE);
        document = document.append("out", new Document("merge", SERVICE));
        database.runCommand(document);
    }