From 8a4810082529e48259ec332e034c05f1eea2399b Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期日, 14 一月 2024 12:24:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/resources/application-prod.yml | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 6185a26..97b38c7 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -20,7 +20,7 @@
# knife4j澧炲己鍔熻兘,寮�鍚悗涓嬮潰鍙傛暟鎵嶇敓鏁�
enable: true
#鏄惁涓虹敓浜фā寮� 椤圭洰閮ㄥ睘鏃朵负true 闃叉鎺ュ彛鏆撮湶
- production: true
+ production: false
# 閰嶇疆鐢ㄦ埛瀵嗙爜
basic:
enable: true
@@ -43,23 +43,26 @@
sy: info
# minio閰嶇疆
minio:
- enabled: false
- endpoint: http://192.168.5.229:9001
+ enabled: true
+ endpoint: http://192.168.1.14:9001
accessKey: admin
secretKey: xzx12345
- path: F:/DATA
+ path: G:/DATA
#娴佸獟浣撹浆鐮佹湇鍔″櫒
mediamtx:
enabled: true
- host: 192.168.5.229
+ host: 192.168.1.14
software_decoding: true
#mqtt
mqtt:
- host: tcp://192.168.5.229:1883
- clientId: server229
+ host: tcp://192.168.1.14:1883
+ clientId: server14
username: admin
password: xzx12345
- topic: minioEvent,apponekey,camera,external,radarWellData
+ topic: minioEvent,radar,stealelec,tube,camera,external,accessControl,apponekey,digitization3,radarForceGuide
timeout: 100
keepalive: 60
- enabled: true
\ No newline at end of file
+ enabled: true
+#涓変竴杞﹁締寮�鍏�
+syCar:
+ enabled: true
--
Gitblit v1.9.3