From b074bb90c4e40051b426aa73707451d57536daee Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 5 Jan 2022 11:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.1.6=E3=80=91=E3=80=90file=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0file=E8=8E=B7=E5=8F=96authUrl=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysFileInfoServiceImpl.java  | 49 ++-----------------
 1 file changed, 4 insertions(+), 45 deletions(-)

diff --git a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
index c7820e303..e89ef4fc7 100644
--- a/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
+++ b/kernel-d-file/file-business/src/main/java/cn/stylefeng/roses/kernel/file/modular/service/impl/SysFileInfoServiceImpl.java
@@ -38,7 +38,6 @@ import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
 import cn.stylefeng.roses.kernel.file.api.FileInfoApi;
 import cn.stylefeng.roses.kernel.file.api.FileOperatorApi;
 import cn.stylefeng.roses.kernel.file.api.constants.FileConstants;
-import cn.stylefeng.roses.kernel.file.api.enums.FileLocationEnum;
 import cn.stylefeng.roses.kernel.file.api.enums.FileStatusEnum;
 import cn.stylefeng.roses.kernel.file.api.exception.FileException;
 import cn.stylefeng.roses.kernel.file.api.exception.enums.FileExceptionEnum;
@@ -54,7 +53,6 @@ import cn.stylefeng.roses.kernel.file.modular.factory.FileInfoFactory;
 import cn.stylefeng.roses.kernel.file.modular.mapper.SysFileInfoMapper;
 import cn.stylefeng.roses.kernel.file.modular.service.SysFileInfoService;
 import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
-import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@@ -428,57 +426,18 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
 
     @Override
     public String getFileAuthUrl(Long fileId) {
-
-        // 获取登录用户的token
-        String token = LoginContext.me().getToken();
-
-        // 获取context-path
-        String contextPath = HttpServletUtil.getRequest().getContextPath();
-
-        SysFileInfoRequest sysFileInfoRequest = new SysFileInfoRequest();
-        sysFileInfoRequest.setFileId(fileId);
-
-        // 获取文件的基本信息
-        SysFileInfo sysFileInfo = querySysFileInfo(sysFileInfoRequest);
-
-        // 获取文件存储位置
-        Integer fileLocation = sysFileInfo.getFileLocation();
-
-        if (!fileLocation.equals(FileLocationEnum.LOCAL.getCode())) {
-            // 获取文件存储到bucket中的名字
-            String fileObjectName = sysFileInfo.getFileObjectName();
-
-            // 返回第三方存储文件url
-            return fileOperatorApi.getFileUnAuthUrl(FileConfigExpander.getDefaultBucket(), fileObjectName);
-        }
-
-        return FileConfigExpander.getServerDeployHost() + contextPath + FileConstants.FILE_PRIVATE_PREVIEW_URL + "?fileId=" + fileId + "&token=" + token;
+        return this.getFileAuthUrl(fileId, LoginContext.me().getToken());
     }
 
     @Override
     public String getFileAuthUrl(Long fileId, String token) {
-
-        // 获取context-path
-        String contextPath = HttpServletUtil.getRequest().getContextPath();
-
+        // 获取文件的基本信息
         SysFileInfoRequest sysFileInfoRequest = new SysFileInfoRequest();
         sysFileInfoRequest.setFileId(fileId);
-
-        // 获取文件的基本信息
         SysFileInfo sysFileInfo = querySysFileInfo(sysFileInfoRequest);
 
-        // 获取文件存储位置
-        Integer fileLocation = sysFileInfo.getFileLocation();
-
-        if (!fileLocation.equals(FileLocationEnum.LOCAL.getCode())) {
-            // 获取文件存储到bucket中的名字
-            String fileObjectName = sysFileInfo.getFileObjectName();
-
-            // 返回第三方存储文件url
-            return fileOperatorApi.getFileAuthUrl(FileConfigExpander.getDefaultBucket(), fileObjectName, FileConfigExpander.getDefaultFileTimeoutSeconds() * 1000);
-        }
-
-        return FileConfigExpander.getServerDeployHost() + contextPath + FileConstants.FILE_PRIVATE_PREVIEW_URL + "?fileId=" + fileId + "&token=" + token;
+        // 返回第三方存储文件url
+        return fileOperatorApi.getFileAuthUrl(sysFileInfo.getFileBucket(), sysFileInfo.getFileObjectName(), FileConfigExpander.getDefaultFileTimeoutSeconds());
     }
 
     /**