Parcourir la source

Merge branch 'master' of https://git.zyuas.com/DJI/shangyun into dev/jkec

# Conflicts:
#	Backend/sample/src/main/resources/application-prd.yml
Ryuiso il y a 10 mois
Parent
commit
d3d75e91c0
1 fichiers modifiés avec 8 ajouts et 0 suppressions
  1. 8 0
      Backend/sample/src/main/resources/application-prd.yml

+ 8 - 0
Backend/sample/src/main/resources/application-prd.yml

@@ -121,9 +121,17 @@ url:
 oss:
   enable: true
   provider: minio
+<<<<<<< HEAD
   endpoint: https://minio.jkec.info:9000
   access-key: uavadmin
   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-logs: log-files
   expire: 3600