From a7aaeabc7873a0eafb4a7ecad7f65b018b7a9bc9 Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 24 Feb 2023 19:31:23 +0800
Subject: [PATCH] What's new? 1. Add license for dock. 2. Modify the logic corresponding to the firmware file and device type. 3. Add multiple mqtt clients options. 4. Modify the structure of the interface for obtaining the device list. 5. Fixed some issues.
---
src/main/java/com/dji/sample/media/model/CredentialsDTO.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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..d00e953 100644
--- a/src/main/java/com/dji/sample/media/model/CredentialsDTO.java
+++ b/src/main/java/com/dji/sample/media/model/CredentialsDTO.java
@@ -17,32 +17,34 @@
@AllArgsConstructor
public class CredentialsDTO {
+ private static final int DELAY = 300;
+
private String accessKeyId;
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();
- this.expire = expire;
+ this.expire = expire - DELAY;
}
public CredentialsDTO(AssumeRoleResponse.Credentials credentials, long expire) {
this.accessKeyId = credentials.getAccessKeyId();
this.accessKeySecret = credentials.getAccessKeySecret();
this.securityToken = credentials.getSecurityToken();
- this.expire = Math.toIntExact(expire);
+ this.expire = expire - DELAY;
}
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 - DELAY;
}
}
--
Gitblit v1.9.3