From 84ffb112e0f8fed4003a4fdd46afb257a87c9e34 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 27 Nov 2025 13:27:17 +0800
Subject: [PATCH] Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev

---
 ard-admin/src/main/resources/application-prod.yml |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index 73cc8d8..be98aff 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -6,7 +6,7 @@
 # token配置
 token:
   # 是否允许账户多终端同时登录（true允许 false不允许）
-  soloLogin: true
+  soloLogin: false
 
 # 日志配置
 logging:
@@ -43,13 +43,6 @@
   #航线KMZ临时存放路径
   waylineSavePath: /home/ard/myworkspace/uav_server/mainserver/waylines
 
-# MinIO
-minio:
-  url: https://192.168.1.3:9001
-  accessKey: admin
-  secretKey: ard12345
-  bucketName: kmz
-
 #上云API
 cloud-api:
   app:
@@ -64,6 +57,9 @@
   apiHost: 192.168.1.3
   playHost: 192.168.1.3
   https: true
+  rtmpPort: 1935
+  rtspPort: 8554
+  webrtcPort: 8889
 
 # mqtt配置
 mqtt:
@@ -86,3 +82,15 @@
   expire: 3600
   region: us-east-1
   object-dir-prefix: wayline
+
+# 机场单独用的oss配置，要http地址
+ossdock:
+  enable: true
+  provider: minio
+  endpoint: http://192.168.1.3:9011
+  access-key: admin2
+  secret-key: ard123456
+  bucket: cloud-bucket
+  expire: 3600
+  region: us-east-1
+  object-dir-prefix: wayline
\ No newline at end of file

--
Gitblit v1.9.3