From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java
index 3d02b52..81dd24e 100644
--- a/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/storage/service/impl/StorageServiceImpl.java
@@ -4,6 +4,7 @@
import com.ard.sample.component.mqtt.model.*;
import com.ard.sample.component.mqtt.service.IMessageSenderService;
import com.ard.oss.model.StsCredentialsDTO;
+import com.ard.sample.config.DockConfiguration;
import com.ard.sample.storage.service.IStorageService;
import com.ard.oss.service.impl.OssServiceContext;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +30,11 @@
@Override
public StsCredentialsDTO getSTSCredentials() {
return StsCredentialsDTO.builder()
- .endpoint(OssConfiguration.endpoint)
- .bucket(OssConfiguration.bucket)
+ //机场媒体库minio配置信息用代理地址，桶用机场的桶。
+ //.endpoint(OssConfiguration.endpoint)
+ .endpoint(DockConfiguration.endpoint)
+// .bucket(OssConfiguration.bucket)
+ .bucket(DockConfiguration.bucket)
.credentials(ossService.getCredentials())
.provider(OssConfiguration.provider)
.objectKeyPrefix(OssConfiguration.objectDirPrefix)
@@ -41,6 +45,7 @@
@Override
@ServiceActivator(inputChannel = ChannelName.INBOUND_REQUESTS_STORAGE_CONFIG_GET, outputChannel = ChannelName.OUTBOUND)
public void replyConfigGet(CommonTopicReceiver receiver, MessageHeaders headers) {
+ // 20251219 这里是获取上传临时凭证的接口，稍候分析下是否满足条件，如果可以的话就直接回复临时凭证即可
CommonTopicResponse<RequestsReply> response = CommonTopicResponse.<RequestsReply>builder()
.tid(receiver.getTid())
.bid(receiver.getBid())
--
Gitblit v1.9.3