Merge remote-tracking branch 'origin/push-186server' into push-debug

# Conflicts:
#	common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java

graph/src/main/resources/bolt.properties

@@ -5,7 +5,7 @@ pass_235 = diagbot@20180822
 
 # neo4j bolt credentials
 #\u7EBF\u4E0A\u4F7F\u7528
-bolt.uri=bolt://192.168.2.232
+bolt.uri=bolt://192.168.2.123
 bolt.user=neo4j
 bolt.passwd=root
 

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -54,9 +54,9 @@ public class    KnowledgeServiceImpl implements KnowledgeService {
     @Autowired
     private BiRepository biRepository;
     private List<BaseNode> baseNodes;
-    private String user = "root";
-    private String password = "lantone";
-    private String url = "jdbc:mysql://192.168.2.241:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    private String user = "teamdata";
+    private String password = "jiO2rfnYhg";
+    private String url = "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8";
     private Pageable pageable;
     /**
      * 处理症状节点相关的申请