Merge branch 'push-debug' of http://192.168.2.236:10080/louhr/push into push-debug

Conflicts:
	graph/src/main/resources/bolt.properties
	graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

graph-web/src/main/resources/url.properties

@@ -1,5 +1,5 @@
-highrisk.http.url=http://192.168.2.186:5004/knowledge/getHighRisk
-lisPacs.http.url=http://192.168.2.186:5004/knowledge/getLisPacs
-disease.http.url=http://192.168.2.186:5004/knowledge/getDisease
+highrisk.http.url=http://192.168.2.234:5004/knowledge/getHighRisk
+lisPacs.http.url=http://192.168.2.234:5004/knowledge/getLisPacs
+disease.http.url=http://192.168.2.234:5004/knowledge/getDisease
 #lisPacs.http.url=http://192.168.3.9:5004/knowledge/getLisPacs
 #highrisk.http.url=http://192.168.3.9:5004/knowledge/getHighRisk

graph/src/main/resources/bolt.properties

@@ -5,9 +5,9 @@ pass_235 = diagbot@20180822
 
 # neo4j bolt credentials
 #\u7EBF\u4E0A\u4F7F\u7528
-bolt.uri=bolt://192.168.3.180
+bolt.uri=bolt://192.168.2.234
 bolt.user=neo4j
-bolt.passwd=123456
+bolt.passwd=root
 
 
 #\u6D4B\u8BD5\u4F7F\u7528