合并分支 'dev_20230216' 到 'master'

Dev 20230216 查看合并请求 laws-foton-slrs/foton-slrs-system-rest!82
2023-05-18 18:39:44 +08:00
parent 93d2f3cbff 14dbf79dc4
commit afbd075cd7
16 changed files with 380 additions and 56 deletions
@@ -290,18 +290,22 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip

 # =============================================================================

+#elasticsearch.clustername=elasticsearch
+#
+#elasticsearch.ip=127.0.0.1
+#
+#elasticsearch.port=9306
+#
+#elasticsearch.poolSize=5
+#
+#elas.flag=true
 elasticsearch.clustername=elasticsearch
-
-elasticsearch.ip=127.0.0.1
-
-elasticsearch.port=9306
-
+elasticsearch.ip=10.100.5.122
+elasticsearch.port=9300
 elasticsearch.poolSize=5
-
 elas.flag=true


-
 # 拆分的图片调用 （修改ip时此处也应该被修改）

 elasticsearch.img=http://localhost:9090