From b912913c1a96c76cc2b43dd22e662c7d02b59c8e Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 05 Aug 2024 16:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/manage/model/dto/LogsUploadCredentialsDTO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/model/dto/LogsUploadCredentialsDTO.java b/src/main/java/com/dji/sample/manage/model/dto/LogsUploadCredentialsDTO.java
index f156c3a..970fc12 100644
--- a/src/main/java/com/dji/sample/manage/model/dto/LogsUploadCredentialsDTO.java
+++ b/src/main/java/com/dji/sample/manage/model/dto/LogsUploadCredentialsDTO.java
@@ -35,13 +35,16 @@
private LogsFileUploadList params;
+ private String region;
+
public LogsUploadCredentialsDTO(StsCredentialsDTO sts) {
this.bucket = sts.getBucket();
- Long expire = sts.getCredentials().getExpire();
+ long expire = sts.getCredentials().getExpire();
sts.getCredentials().setExpire(System.currentTimeMillis() + (expire - 60) * 1000);
this.credentials = sts.getCredentials();
this.endpoint = sts.getEndpoint();
this.objectKeyPrefix = sts.getObjectKeyPrefix();
this.provider = sts.getProvider();
+ this.region = sts.getRegion();
}
}
--
Gitblit v1.9.3