From fee6cbe63d4dc2df256e2a6977331e26d84588de Mon Sep 17 00:00:00 2001 From: zhaowenyu <35589726@qq.com> Date: Wed, 17 Dec 2025 15:37:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ard-admin/src/main/resources/application-prod.yml | 12 +----------- 1 files changed, 1 insertions(+), 11 deletions(-) diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml index 991128e..0e1b10f 100644 --- a/ard-admin/src/main/resources/application-prod.yml +++ b/ard-admin/src/main/resources/application-prod.yml @@ -77,7 +77,6 @@ enable: true provider: minio endpoint: https://192.168.1.3:9001 - endpoint-spare: http://111.40.46.199:9011 access-key: admin secret-key: ard12345 bucket: cloud-bucket @@ -85,14 +84,5 @@ region: us-east-1 object-dir-prefix: wayline -# 机场单独用的oss配置，要http地址 http://192.168.1.3:9011 -ossdock: - enable: true - provider: minio +dock: endpoint: http://111.40.46.199: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