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

nlp/src/main/resources/nlp.properties

@@ -1,3 +1,3 @@
 #Êý¾ÝÎļþ´æ·Å·¾¶
-#cache.file.dir=/opt/diagbot-push/cache_file/
-cache.file.dir=d:\\cache_file\\
+cache.file.dir=/opt/diagbot-push/cache_file/
+#cache.file.dir=d:\\cache_file\\