From e2d97f3c90a6baa36b9edefe927225da907a27c6 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 10:02:15 +0800
Subject: [PATCH] 去除默认机构默认仓库逻辑
---
consum-base/src/main/java/com/consum/base/BaseController.java | 10 ++--------
1 files changed, 2 insertions(+), 8 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 5cb5081..468f48c 100644
--- a/consum-base/src/main/java/com/consum/base/BaseController.java
+++ b/consum-base/src/main/java/com/consum/base/BaseController.java
@@ -3,7 +3,6 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import java.net.URLEncoder;
import javax.servlet.http.HttpServletResponse;
@@ -50,20 +49,15 @@
}
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"));
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 "/file" + fileUrl;
+
+ return "/file/" + fileUrl;
}
}
--
Gitblit v1.9.1