From ef85da98d2a90fa260d31094a20eb5a12d9979e0 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Sat, 2 Jan 2021 22:15:16 +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=E6=B8=B2=E6=9F=93url=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=80=83=E8=99=91context-path=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file/modular/service/impl/SysFileInfoServiceImpl.java   | 6 +++++-
 .../roses/kernel/file/local/LocalFileOperator.java          | 6 +++++-
 .../roses/kernel/file/minio/MinIoFileOperator.java          | 6 +++++-
 3 files changed, 15 insertions(+), 3 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 f5cae846c..16578eebd 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
@@ -29,6 +29,7 @@ import cn.stylefeng.roses.kernel.file.util.DownloadUtil;
 import cn.stylefeng.roses.kernel.file.util.PdfFileTypeUtil;
 import cn.stylefeng.roses.kernel.file.util.PicFileTypeUtil;
 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;
@@ -365,7 +366,10 @@ public class SysFileInfoServiceImpl extends ServiceImpl<SysFileInfoMapper, SysFi
         // 获取登录用户的token
         String token = LoginContext.me().getToken();
 
-        return FileConfigExpander.getServerDeployHost() + FileConstants.FILE_PRIVATE_PREVIEW_URL + "?fileId=" + fileId + "&token=" + token;
+        // 获取context-path
+        String contextPath = HttpServletUtil.getRequest().getContextPath();
+
+        return FileConfigExpander.getServerDeployHost() + contextPath + FileConstants.FILE_PRIVATE_PREVIEW_URL + "?fileId=" + fileId + "&token=" + token;
     }
 
     /**
diff --git a/kernel-d-file/file-sdk-local/src/main/java/cn/stylefeng/roses/kernel/file/local/LocalFileOperator.java b/kernel-d-file/file-sdk-local/src/main/java/cn/stylefeng/roses/kernel/file/local/LocalFileOperator.java
index 07b07d3ac..f64cb0e36 100644
--- a/kernel-d-file/file-sdk-local/src/main/java/cn/stylefeng/roses/kernel/file/local/LocalFileOperator.java
+++ b/kernel-d-file/file-sdk-local/src/main/java/cn/stylefeng/roses/kernel/file/local/LocalFileOperator.java
@@ -11,6 +11,7 @@ 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.LocalFileProperties;
+import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
 
 import java.io.File;
 import java.io.InputStream;
@@ -151,7 +152,10 @@ public class LocalFileOperator implements FileOperatorApi {
         // 获取登录用户的token
         String token = LoginContext.me().getToken();
 
-        return FileConfigExpander.getServerDeployHost() + FileConstants.FILE_PRIVATE_PREVIEW_URL + "?fileBucket=" + bucketName + "&fileObjectName=" + key + "&token=" + token;
+        // 获取context-path
+        String contextPath = HttpServletUtil.getRequest().getContextPath();
+
+        return FileConfigExpander.getServerDeployHost() + contextPath + FileConstants.FILE_PRIVATE_PREVIEW_URL + "?fileBucket=" + bucketName + "&fileObjectName=" + key + "&token=" + token;
     }
 
     @Override
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 db875c1c0..1b655914c 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
@@ -12,6 +12,7 @@ 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.rule.util.HttpServletUtil;
 import io.minio.MinioClient;
 import io.minio.errors.InvalidEndpointException;
 import io.minio.errors.InvalidPortException;
@@ -195,7 +196,10 @@ public class MinIoFileOperator implements FileOperatorApi {
         // 获取登录用户的token
         String token = LoginContext.me().getToken();
 
-        return FileConfigExpander.getServerDeployHost() + FileConstants.FILE_PRIVATE_PREVIEW_URL + "?fileBucket=" + bucketName + "&fileObjectName=" + key + "&token=" + token;
+        // 获取context-path
+        String contextPath = HttpServletUtil.getRequest().getContextPath();
+
+        return FileConfigExpander.getServerDeployHost() + contextPath + FileConstants.FILE_PRIVATE_PREVIEW_URL + "?fileBucket=" + bucketName + "&fileObjectName=" + key + "&token=" + token;
 
     }