Merge branch 'master' of http://git.dashitech.com/chenxiao/hsmsV1-CallSocket

src/main/resources/application.properties

@@ -54,12 +54,15 @@ mysql2.spring.datasource.testOnReturn=true
 
 #project=HSMS
 #project=ITSM
+#project=ALL
+#ALL就是一站式，两个项目都部署了
 project=ALL
 #配置呼叫中心以哪个项目为主，ITSM或者HSMS。单项目与project一致即可
 project.main=HSMS
-#db.hjzx.record.nginx=/hjzxRecord
+# 常规
+db.hjzx.record.nginx=/hjzxRecord
 # 南京
-db.hjzx.record.nginx=/record/192.144.21.171
+#db.hjzx.record.nginx=/record/192.144.21.171
 db.hjzx.record.path.regex=voice