From 0689ca5412bc016da483194928163ffd684ead69 Mon Sep 17 00:00:00 2001
From: HopeLi <1278288511@qq.com>
Date: Fri, 27 Jun 2025 17:05:55 +0800
Subject: [PATCH] =?UTF-8?q?0627=20ljc=20=20=20=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cd/casic/ci/api/TargetController.java     |  6 ++----
 .../service/target/TargetManagerService.java       |  3 ++-
 .../target/impl/TargetManagerServiceImpl.java      | 14 +++++---------
 .../cd/casic/ci/process/util/SftpUploadUtil.java   | 13 +++++++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java
index 1c32377f..217b9c5e 100644
--- a/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java
+++ b/modules/module-ci-process-api/src/main/java/cd/casic/ci/api/TargetController.java
@@ -134,11 +134,9 @@ public class TargetController {
 
 
     @PostMapping(path="/fileDownload")
-    public CommonResult<String> fileDownload(@RequestBody @Valid TargetDownloadReq req, HttpServletResponse httpResponse) throws SftpUploadUtil.SftpUploadException, IOException {
+    public void fileDownload(@RequestBody @Valid TargetDownloadReq req, HttpServletResponse response) throws SftpUploadUtil.SftpUploadException, IOException {
+        targetManagerService.fileDownload(req,response);
 
-        String inputStream = targetManagerService.fileDownload(req);
-
-        return CommonResult.success(inputStream);
     }
 
     @PostMapping(path = "/uploadFolder")
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetManagerService.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetManagerService.java
index 751c53c7..176eefbf 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetManagerService.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/TargetManagerService.java
@@ -8,6 +8,7 @@ import cd.casic.ci.process.process.dataObject.target.TargetManager;
 import cd.casic.ci.process.util.SftpUploadUtil;
 import cd.casic.framework.commons.pojo.PageResult;
 import com.baomidou.mybatisplus.extension.service.IService;
+import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -40,5 +41,5 @@ public interface TargetManagerService extends IService<TargetManager> {
 
     void updateVersion(@Valid TargetVersionUpdateReq req);
 
-    String fileDownload(@Valid TargetDownloadReq req) throws SftpUploadUtil.SftpUploadException, IOException;
+    void fileDownload(@Valid TargetDownloadReq req, HttpServletResponse response) throws SftpUploadUtil.SftpUploadException, IOException;
 }
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java
index 525aa0ce..283df5bb 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/target/impl/TargetManagerServiceImpl.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -34,7 +35,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.List;
 import java.util.UUID;
 
@@ -268,19 +268,16 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
     }
 
     @Override
-    public String fileDownload(TargetDownloadReq req) throws SftpUploadUtil.SftpUploadException, IOException {
-        InputStream inputStream = SftpUploadUtil.downloadFileSftp(
+    public void fileDownload(TargetDownloadReq req, HttpServletResponse response) throws SftpUploadUtil.SftpUploadException, IOException {
+        SftpUploadUtil.downloadFileSftp(
                 req.getRemoteHost(),
                 req.getRemotePort(),
                 req.getUsername(),
                 req.getPassword(),
                 req.getSshKeyPath(),
-                req.getRemoteFilePath()
+                req.getRemoteFilePath(),
+                response
         );
-
-        byte[] byteArray = toByteArray(inputStream);
-        String base64Content = Base64.getEncoder().encodeToString(byteArray);
-        return base64Content;
     }
 
 
@@ -292,7 +289,6 @@ public class TargetManagerServiceImpl extends ServiceImpl<TargetManagerDao, Targ
         while ((nRead = is.read(data, 0, data.length)) != -1) {
             buffer.write(data, 0, nRead);
         }
-
         return buffer.toByteArray();
     }
 }
diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/SftpUploadUtil.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/SftpUploadUtil.java
index 83f1eee5..22bc0d62 100644
--- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/SftpUploadUtil.java
+++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/util/SftpUploadUtil.java
@@ -1,7 +1,10 @@
 package cd.casic.ci.process.util;
 
 import cd.casic.framework.commons.exception.ServiceException;
+import com.amazonaws.util.IOUtils;
 import com.jcraft.jsch.*;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
@@ -324,13 +327,14 @@ public class SftpUploadUtil {
      * @param remoteFilePath    要下载的文件地址（包含文件名）
      * @throws SftpUploadException 如果上传过程中发生任何错误
      */
-    public static InputStream downloadFileSftp(
+    public static void downloadFileSftp(
             String remoteHost,
             Integer remotePort,
             String username,
             String password,
             String sshKeyPath,
-            String remoteFilePath) throws SftpUploadException {
+            String remoteFilePath,
+            HttpServletResponse response) throws SftpUploadException {
 
         Session session = null;
         Channel channel = null;
@@ -415,8 +419,9 @@ public class SftpUploadUtil {
             if (inputStream == null) {
                 throw new SftpUploadException("无法获取远程文件输入流，请检查文件是否存在或被其他进程占用: " + fileName);
             }
-
-            return inputStream;
+            ServletOutputStream outputStream = response.getOutputStream();
+            IOUtils.copy(inputStream,outputStream);
+            outputStream.flush();
         } catch (JSchException e) {
             throw new SftpUploadException("SFTP 连接或认证失败: " + e.getMessage(), e);
         } catch (SftpException e) {