From 1505ab56b90467114d8c472ab610a0843aa9ca80 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 28 Dec 2020 13:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90file=E3=80=91=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=8E=B7=E5=8F=96authUrl=E7=9A=84=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/file/aliyun/AliyunFileOperator.java  |  2 +-
 kernel-d-file/file-sdk-minio/pom.xml            |  6 +++---
 .../kernel/file/minio/MinIoFileOperator.java    | 17 +++++------------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/kernel-d-file/file-sdk-aliyun/src/main/java/cn/stylefeng/roses/kernel/file/aliyun/AliyunFileOperator.java b/kernel-d-file/file-sdk-aliyun/src/main/java/cn/stylefeng/roses/kernel/file/aliyun/AliyunFileOperator.java
index 332567794..c8b09a17c 100644
--- a/kernel-d-file/file-sdk-aliyun/src/main/java/cn/stylefeng/roses/kernel/file/aliyun/AliyunFileOperator.java
+++ b/kernel-d-file/file-sdk-aliyun/src/main/java/cn/stylefeng/roses/kernel/file/aliyun/AliyunFileOperator.java
@@ -181,7 +181,7 @@ public class AliyunFileOperator implements FileOperatorApi {
     @Override
     public String getFileAuthUrl(String bucketName, String key, Long timeoutMillis) {
         try {
-            Date expiration = new Date(new Date().getTime() + timeoutMillis);
+            Date expiration = new Date(System.currentTimeMillis() + timeoutMillis);
             URL url = ossClient.generatePresignedUrl(bucketName, key, expiration);
             return url.toString();
         } catch (OSSException | ClientException e) {
diff --git a/kernel-d-file/file-sdk-minio/pom.xml b/kernel-d-file/file-sdk-minio/pom.xml
index aa7279da6..dd5ced902 100644
--- a/kernel-d-file/file-sdk-minio/pom.xml
+++ b/kernel-d-file/file-sdk-minio/pom.xml
@@ -24,11 +24,11 @@
             <version>1.0.0</version>
         </dependency>
 
-        <!--jwt模块-->
-        <!--用来给生成带鉴权的url用-->
+        <!--auth模块的api-->
+        <!--用来获取当前登录用户的token，生成file的url-->
         <dependency>
             <groupId>cn.stylefeng.roses</groupId>
-            <artifactId>jwt-sdk</artifactId>
+            <artifactId>auth-api</artifactId>
             <version>1.0.0</version>
         </dependency>
 
diff --git a/kernel-d-file/file-sdk-minio/src/main/java/cn/stylefeng/roses/kernel/file/minio/MinIoFileOperator.java b/kernel-d-file/file-sdk-minio/src/main/java/cn/stylefeng/roses/kernel/file/minio/MinIoFileOperator.java
index 48c4cc83f..2b259f055 100644
--- a/kernel-d-file/file-sdk-minio/src/main/java/cn/stylefeng/roses/kernel/file/minio/MinIoFileOperator.java
+++ b/kernel-d-file/file-sdk-minio/src/main/java/cn/stylefeng/roses/kernel/file/minio/MinIoFileOperator.java
@@ -4,15 +4,14 @@ import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
 import cn.stylefeng.roses.kernel.file.FileOperatorApi;
 import cn.stylefeng.roses.kernel.file.constants.FileConstants;
+import cn.stylefeng.roses.kernel.file.enums.BucketAuthEnum;
 import cn.stylefeng.roses.kernel.file.exception.FileException;
 import cn.stylefeng.roses.kernel.file.exception.enums.FileExceptionEnum;
 import cn.stylefeng.roses.kernel.file.expander.FileConfigExpander;
 import cn.stylefeng.roses.kernel.file.pojo.props.MinIoProperties;
-import cn.stylefeng.roses.kernel.file.enums.BucketAuthEnum;
-import cn.stylefeng.roses.kernel.jwt.JwtTokenOperator;
-import cn.stylefeng.roses.kernel.jwt.api.pojo.config.JwtConfig;
 import io.minio.MinioClient;
 import io.minio.errors.InvalidEndpointException;
 import io.minio.errors.InvalidPortException;
@@ -193,17 +192,11 @@ public class MinIoFileOperator implements FileOperatorApi {
     @Override
     public String getFileAuthUrl(String bucketName, String key, Long timeoutMillis) {
 
-        // 初始化jwt token的生成工具
-        JwtConfig jwtConfig = new JwtConfig();
-        jwtConfig.setJwtSecret(FileConfigExpander.getFileAuthJwtSecret());
-        jwtConfig.setExpiredSeconds(timeoutMillis / 1000);
-        JwtTokenOperator jwtTokenOperator = new JwtTokenOperator(jwtConfig);
-
-        // 生成token
-        String token = jwtTokenOperator.generateToken(new HashMap<>());
+        // 获取登录用户的token
+        String token = LoginContext.me().getToken();
 
         // 拼接url = “host” + “预览图片的url” + “?token=xxx”
-        return FileConfigExpander.getServerDeployHost() + FileConstants.FILE_PREVIEW_URL + "?token=" + token;
+        return FileConfigExpander.getServerDeployHost() + FileConstants.FILE_PREVIEW_URL + "?fileBucket=" + bucketName + "&fileObjectName=" + key + "&token=" + token;
 
     }