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

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

@@ -23,7 +23,7 @@ public class CacheFileManager {
 
     private String user = "root";
     private String password = "lantone";
-    private String url = "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    private String url = "jdbc:mysql://192.168.2.241:3306/med?useUnicode=true&characterEncoding=UTF-8";
 
     private String path = "";
 

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

@@ -1,5 +1,5 @@
-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
+highrisk.http.url=http://192.168.2.241:5004/knowledge/getHighRisk
+lisPacs.http.url=http://192.168.2.241:5004/knowledge/getLisPacs
+disease.http.url=http://192.168.2.241: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.168.2.234:5002/nlp-web";
-var bigdata_web_url = "http://192.168.2.234:5001/bigdata-web";
-var graph_web_url = "http://192.168.2.234:5003/graph-web";
+var nlp_web_url = "http://192.168.2.241:5002/nlp-web";
+var bigdata_web_url = "http://192.168.2.241:5001/bigdata-web";
+var graph_web_url = "http://192.168.2.241: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";