From 5c0a5b54969ee084d699ba74b708411e51dba690 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Tue, 28 Nov 2023 19:23:52 +0800
Subject: [PATCH] 无人机 -媒体文件上传
---
src/main/java/com/dji/sample/component/oss/service/impl/MinIOServiceImpl.java | 2 +-
src/main/java/com/dji/sample/storage/service/impl/StorageServiceImpl.java | 2 +-
src/main/java/com/dji/sample/component/oss/model/OssConfiguration.java | 4 ++++
src/main/resources/application.yml | 1 +
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/oss/model/OssConfiguration.java b/src/main/java/com/dji/sample/component/oss/model/OssConfiguration.java
index da668c9..19aa14b 100644
--- a/src/main/java/com/dji/sample/component/oss/model/OssConfiguration.java
+++ b/src/main/java/com/dji/sample/component/oss/model/OssConfiguration.java
@@ -26,6 +26,7 @@
* The protocol needs to be included at the beginning of the address.
*/
public static String endpoint;
+ public static String externalEndpoint;
public static String accessKey;
@@ -54,6 +55,9 @@
public void setEndpoint(String endpoint) {
OssConfiguration.endpoint = endpoint;
}
+ public void setExternalEndpoint(String externalEndpoint) {
+ OssConfiguration.externalEndpoint = externalEndpoint;
+ }
public void setAccessKey(String accessKey) {
OssConfiguration.accessKey = accessKey;
diff --git a/src/main/java/com/dji/sample/component/oss/service/impl/MinIOServiceImpl.java b/src/main/java/com/dji/sample/component/oss/service/impl/MinIOServiceImpl.java
index 03e76e4..21024c8 100644
--- a/src/main/java/com/dji/sample/component/oss/service/impl/MinIOServiceImpl.java
+++ b/src/main/java/com/dji/sample/component/oss/service/impl/MinIOServiceImpl.java
@@ -38,7 +38,7 @@
@Override
public CredentialsDTO getCredentials() {
try {
- AssumeRoleProvider provider = new AssumeRoleProvider(OssConfiguration.endpoint, OssConfiguration.accessKey,
+ AssumeRoleProvider provider = new AssumeRoleProvider(OssConfiguration.externalEndpoint, OssConfiguration.accessKey,
OssConfiguration.secretKey, Math.toIntExact(OssConfiguration.expire),
null, OssConfiguration.region, null, null, null, null);
return new CredentialsDTO(provider.fetch(), OssConfiguration.expire);
diff --git a/src/main/java/com/dji/sample/storage/service/impl/StorageServiceImpl.java b/src/main/java/com/dji/sample/storage/service/impl/StorageServiceImpl.java
index 8c02072..5bc368a 100644
--- a/src/main/java/com/dji/sample/storage/service/impl/StorageServiceImpl.java
+++ b/src/main/java/com/dji/sample/storage/service/impl/StorageServiceImpl.java
@@ -29,7 +29,7 @@
@Override
public StsCredentialsDTO getSTSCredentials() {
return StsCredentialsDTO.builder()
- .endpoint(OssConfiguration.endpoint)
+ .endpoint(OssConfiguration.externalEndpoint)
.bucket(OssConfiguration.bucket)
.credentials(ossService.getCredentials())
.provider(OssConfiguration.provider)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 520093d..0420326 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -135,6 +135,7 @@
# access-key: admin
# secret-key: 12345678
endpoint: http://dev.jxpskj.com:9000
+ external-endpoint: http://dev.jxpskj.com:9000
# endpoint: https://dev.jxpskj.com:8026
access-key: pskj
secret-key: pskj@2021
--
Gitblit v1.9.3