Merge remote-tracking branch 'origin/push-dev-concat-model' into push-dev-concat-model

algorithm/src/main/resources/algorithm.properties

@@ -1,8 +1,8 @@
 ################################ model basic url ###################################
 
 #basicPath=E:/project/push/algorithm/src/main/models/model_version_replacement/model
-#basicPath=/opt/models/dev/models/model_version_replacement/model
-basicPath=E:/models_2019_9_24_16_21_29/model_version_replacement/model
+basicPath=/opt/models/dev/models/model_version_replacement/model
+#basicPath=E:/models_2019_9_24_16_21_29/model_version_replacement/model
 
 ############################### current model version ################################
 diagnosisPredict.version=outpatient_556_IOE_1

nlp-web/src/main/java/org/diagbot/nlp/controller/FeatureController.java

@@ -156,7 +156,7 @@ public class FeatureController extends BaseController<Feature, FeatureWrapper, L
             List<Map<String, Object>> data = new ArrayList<>();
 
             PropertiesUtil propertiesUtil = new PropertiesUtil("nlp.properties");
-            featureNum = propertiesUtil.getProperty("push.feature.num");
+            featureNum = propertiesUtil.getProperty("extract.feature.num");
             Boolean filter = false;//判断是否需要过滤
             if(propertiesUtil.getProperty("extract.feature.filter").equals("1")){//配置为1时过滤
                 filter = true;

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

@@ -1,4 +1,4 @@
-var nlp_web_url = "http://192.168.3.100:5002/nlp-web";
+var nlp_web_url = "http://192.168.2.186:5002/nlp-web";
 var bigdata_web_url = "http://192.168.2.186:5001/bigdata-web";
 var graph_web_url = "http://192.168.2.186:5003/graph-web";
 // var push_web_url = "http://192.168.2.234:5008/push-web";