|
@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.BufferedInputStream;
|
|
|
import java.io.IOException;
|
|
@@ -39,14 +40,14 @@ public class DownloadController {
|
|
|
// }
|
|
|
|
|
|
@GetMapping("/download")
|
|
|
- private void download(@RequestParam String type, HttpServletResponse response) throws Exception {
|
|
|
+ private void download(@RequestParam String type, HttpServletRequest req, HttpServletResponse response) throws Exception {
|
|
|
//读取文件
|
|
|
InputStream resourceAsStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("siatic/file/批量上传变更记录模板.xlsx");
|
|
|
String fileName = "批量上传变更记录模板.xlsx";
|
|
|
InputStream inputStream = new BufferedInputStream(resourceAsStream);
|
|
|
@SuppressWarnings("resource")
|
|
|
Workbook workbook = new XSSFWorkbook(inputStream);
|
|
|
- String userAgent = response.getHeader("User-Agent");
|
|
|
+ String userAgent = req.getHeader("User-Agent");
|
|
|
if (userAgent.contains("MSIE") || userAgent.contains("Trident")) {
|
|
|
fileName = new String(fileName.getBytes("gbk"), "utf-8");
|
|
|
} else {
|