From 5524cfff956b81fcd1ebeb40ac57924a38be42d8 Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期四, 19 十二月 2024 15:02:17 +0800
Subject: [PATCH] 问题修改
---
consum-base/src/main/java/com/consum/base/BaseController.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/BaseController.java b/consum-base/src/main/java/com/consum/base/BaseController.java
index be0d5ba..cbeaf36 100644
--- a/consum-base/src/main/java/com/consum/base/BaseController.java
+++ b/consum-base/src/main/java/com/consum/base/BaseController.java
@@ -3,9 +3,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.net.URLEncoder;
-
-import javax.servlet.http.HttpServletResponse;
import org.apache.poi.ss.usermodel.Workbook;
@@ -49,21 +46,16 @@
return this.getFinSysTenantUserCache().get(String.valueOf(userInfo.getId()));
}
- protected String downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws Exception {
- response.setCharacterEncoding("UTF-8");
- response.setHeader("content-Type", "application/vnd.ms-excel");
- response.setHeader("Content-Disposition",
- "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
+ protected String downLoadExcel(String fileName, Workbook workbook) throws Exception {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
workbook.write(byteArrayOutputStream);
- response.setHeader("Content-Length", String.valueOf(byteArrayOutputStream.size()));
InputStream byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
FileInfo fileInfo = this.uploadFileToLocal(byteArrayInputStream, fileName + ".xls", "-1",
byteArrayOutputStream.size(), 0, "-1");
String fileUrl = fileInfo.getUrl();
- workbook.close();
- return fileUrl;
+
+ return "/file/" + fileUrl;
}
}
--
Gitblit v1.9.1