From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-ops/drone-resource/src/main/resources/application-dev.yml | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/drone-ops/drone-resource/src/main/resources/application-dev.yml b/drone-ops/drone-resource/src/main/resources/application-dev.yml
index 29acc70..67c5bdc 100644
--- a/drone-ops/drone-resource/src/main/resources/application-dev.yml
+++ b/drone-ops/drone-resource/src/main/resources/application-dev.yml
@@ -11,19 +11,22 @@
zipPreFix: ${odm.down.temp.zipPreFix}
zipBasePath: ${odm.down.temp.zipBasePath}
+#oss默认配置
oss:
- enable: true
- provider: minio
- endpoint: http://192.168.1.204:9000
- external-endpoint: http://192.168.1.204:9000
- access-key: ztzfminio
- secret-key: ztzfminio
- bucket: jaxm
- expire: 3600
- region: us-east-1
- object-dir-prefix:
- out-net-file-address: http://192.168.1.204:9000
- minio-path: http://192.168.1.204:9000
-#服务器minio地址
-media:
- server-address: D:\software\minio\minio_data\jaxm
+ #开启oss配置
+ enabled: true
+ #开启oss类型
+ #minio、s3、qiniu、alioss、huaweiobs、tencentcos
+ name: minio
+ #租户模式
+ tenant-mode: true
+ #oss服务地址
+ endpoint: http://218.202.104.82:39000
+ #minio转换服务地址，用于内网上传后将返回地址改为转换的外网地址
+ transform-endpoint: http://218.202.104.82:39000
+ #访问key
+ access-key: admin
+ #密钥key
+ secret-key: geovis@123
+ #存储桶
+ bucket-name: jian-bucket
--
Gitblit v1.9.3