Merge branch 'push-186server' of http://223.93.170.82:10080/louhr/push into his/shaoyifu

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

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

@@ -1,5 +1,5 @@
-highrisk.http.url=http://192.10.11.46:5004/knowledge/getHighRisk
-lisPacs.http.url=http://192.10.11.46:5004/knowledge/getLisPacs
-disease.http.url=http://192.10.11.46:5004/knowledge/getDisease
+highrisk.http.url=http://192.1.3.116:5004/knowledge/getHighRisk
+lisPacs.http.url=http://192.1.3.116:5004/knowledge/getLisPacs
+disease.http.url=http://192.1.3.116: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

push-web/src/main/resources/static/dist/js/push.js

@@ -1,6 +1,6 @@
-var nlp_web_url = "http://192.10.11.46:5002/nlp-web";
-var bigdata_web_url = "http://192.10.11.46:5001/bigdata-web";
-var graph_web_url = "http://192.10.11.46:5003/graph-web";
+var nlp_web_url = "http://192.1.3.116:5002/nlp-web";
+var bigdata_web_url = "http://192.1.3.116:5001/bigdata-web";
+var graph_web_url = "http://192.1.3.116:5003/graph-web";
 // var push_web_url = "http://192.168.2.234:5008/push-web";
 
 // var nlp_web_url = "http://192.168.3.180:5002/nlp-web";