Merge remote-tracking branch 'origin/dev_foton_GJB'

# Conflicts: # adc-da-main/src/main/resources/application.properties
2023-02-13 09:25:44 +08:00
parent b585602df7 9e80e6f93e
commit 862960b3bf
7 changed files with 168 additions and 12 deletions
@@ -149,6 +149,10 @@ elasticsearch.port=9300
 elasticsearch.poolSize=5
 elas.flag=true

+# 拆分的图片调用 （修改ip时此处也应该被修改）
+elasticsearch.img=http://localhost:9090
+
+#  \u6587\u6863\u8F6C\u6362TCP\u901A\u8BAF\u5730\u5740
 #  鏂囨。杞�崲TCP閫氳�鍦板潃
 convert.host=127.0.0.1