From 8ce3bb68bdc2250cc4a8a3d29085443fac64615a Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 23 Sep 2022 18:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/main' into v1.2.0
---
src/main/java/com/dji/sample/media/model/CredentialsDTO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/model/CredentialsDTO.java b/src/main/java/com/dji/sample/media/model/CredentialsDTO.java
index be146bd..4280a92 100644
--- a/src/main/java/com/dji/sample/media/model/CredentialsDTO.java
+++ b/src/main/java/com/dji/sample/media/model/CredentialsDTO.java
@@ -21,11 +21,11 @@
private String accessKeySecret;
- private Integer expire;
+ private Long expire;
private String securityToken;
- public CredentialsDTO(Credentials credentials, int expire) {
+ public CredentialsDTO(Credentials credentials, long expire) {
this.accessKeyId = credentials.accessKey();
this.accessKeySecret = credentials.secretKey();
this.securityToken = credentials.sessionToken();
@@ -36,13 +36,13 @@
this.accessKeyId = credentials.getAccessKeyId();
this.accessKeySecret = credentials.getAccessKeySecret();
this.securityToken = credentials.getSecurityToken();
- this.expire = Math.toIntExact(expire);
+ this.expire = expire;
}
public CredentialsDTO(com.amazonaws.services.securitytoken.model.Credentials credentials) {
this.accessKeyId = credentials.getAccessKeyId();
this.accessKeySecret = credentials.getSecretAccessKey();
this.securityToken = credentials.getSessionToken();
- this.expire = Math.toIntExact((credentials.getExpiration().getTime() - System.currentTimeMillis()) / 1000);
+ this.expire = (credentials.getExpiration().getTime() - System.currentTimeMillis()) / 1000;
}
}
--
Gitblit v1.9.3