From c0b167404dbc4e98ccb8b84f94f48c96bcb3df02 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 12 Dec 2025 09:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/resources/application-daqing.yml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml
index 62774ef..ce8b82a 100644
--- a/ard-admin/src/main/resources/application-daqing.yml
+++ b/ard-admin/src/main/resources/application-daqing.yml
@@ -49,7 +49,7 @@
id: 143640
key: da5babf38a5d05b0f46a7d82910da1b
license: khjd7FzUTzJgaArNv97XdA2nKQtYfESOvBHLqjC6MpvPqxCfuQ82nOlTgzoiLp7UoZujARopN2A1ctPFaJ8oHiHQrn3IRV4wqN3hdSM40xXj02YVvTWQBT54WS8Ks+E8Zatp3gk2T0+7cM5a5a3mWzxLMv7CNqw2z9pFBoOBdpY=
- host: 192.168.1.15
+ host: 192.168.10.103
port: 123
#流媒体
@@ -79,3 +79,15 @@
expire: 3600
region: us-east-1
object-dir-prefix: wayline
+
+# 机场单独用的oss配置，要http地址
+ossdock:
+ enable: true
+ provider: minio
+ endpoint: http://192.168.10.103: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