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

# Conflicts: # adc-da-main/src/main/resources/application-dev.properties
2022-11-24 17:30:46 +08:00
parent 19d89cb73f 50ded28c72
commit 044468b7f5
2 changed files with 4 additions and 4 deletions
@@ -144,8 +144,8 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip
 # elasticsearch 配置
 # =============================================================================
 elasticsearch.clustername=elasticsearch
-elasticsearch.ip=10.100.5.122
-elasticsearch.port=9300
+elasticsearch.ip=127.0.0.1
+elasticsearch.port=9306
 elasticsearch.poolSize=5
 elas.flag=true