Merge remote-tracking branch 'origin/push-dev' into push-test

Conflicts:
	common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java
	graph/src/main/resources/bolt.properties
	graphdb/src/main/resources/application.yml

common-push/src/main/java/org/diagbot/common/push/work/ParamsDataProxy.java

@@ -240,10 +240,10 @@ public class ParamsDataProxy {
                 map.put("concept", String.valueOf(featureMap.get("concept")));
                 if (Constants.default_negative.equals(featureMap.get("negative"))) {
                     if (map.get("featureType").equals(Constants.feature_type_time)) {
-                        searchData.getInputs().put("时间", map);
+//                        searchData.getInputs().put("时间", map);
                     } else {
                         if (searchData.getInputs().get(map.get("feature_name")) == null) {
-                            if (i < 5) {
+                            if (i < 8) {
                                 searchData.getInputs().put(map.get("feature_name"), map);
                             }
                             searchData.getGraphInputs().put(map.get("feature_name"), map);