Merge remote-tracking branch 'origin/develop_master' into develop_1

2021-08-11 23:06:47 +08:00
parent 1374bc5807 ae553d92af
commit db5ea125fb
21 changed files with 1368 additions and 5 deletions
@@ -144,3 +144,7 @@ elasticsearch.ip=192.168.10.47
 elasticsearch.port=9300
 elasticsearch.poolSize=5
 elas.flag=true
+
+#  文档转换TCP通讯地址
+convert.host=127.0.0.1
+#convert.host=0.0.0.0