|
@@ -121,9 +121,17 @@ url:
|
|
|
oss:
|
|
oss:
|
|
|
enable: true
|
|
enable: true
|
|
|
provider: minio
|
|
provider: minio
|
|
|
|
|
+<<<<<<< HEAD
|
|
|
endpoint: https://minio.jkec.info:9000
|
|
endpoint: https://minio.jkec.info:9000
|
|
|
access-key: uavadmin
|
|
access-key: uavadmin
|
|
|
secret-key: YEDG9DZ8oby97UGMyxW&
|
|
secret-key: YEDG9DZ8oby97UGMyxW&
|
|
|
|
|
+=======
|
|
|
|
|
+ endpoint: https://minio.ryuiso.com:59000
|
|
|
|
|
+ # access-key: dji_media
|
|
|
|
|
+ # secret-key: W9AB^CJ*3WcBR6z#
|
|
|
|
|
+ access-key: oss_library
|
|
|
|
|
+ secret-key: yDkG9YJiC92G3vk52goST
|
|
|
|
|
+>>>>>>> 8ff7aa2bb1257a92a76510236feae1b5f55e1a25
|
|
|
bucket: dji-cloudapi
|
|
bucket: dji-cloudapi
|
|
|
bucket-logs: log-files
|
|
bucket-logs: log-files
|
|
|
expire: 3600
|
|
expire: 3600
|
