|
@@ -46,8 +46,13 @@ public class DownloadController {
|
|
|
InputStream inputStream = new BufferedInputStream(resourceAsStream);
|
|
|
@SuppressWarnings("resource")
|
|
|
Workbook workbook = new XSSFWorkbook(inputStream);
|
|
|
-
|
|
|
- fileName = new String(fileName.getBytes("UTF-8"), "ISO-8859-1");
|
|
|
+ String userAgent = response.getHeader("User-Agent");
|
|
|
+ if (userAgent.contains("MSIE") || userAgent.contains("Trident")) {
|
|
|
+ fileName = new String(fileName.getBytes("gbk"), "utf-8");
|
|
|
+ } else {
|
|
|
+
|
|
|
+ fileName = new String(fileName.getBytes("UTF-8"), "ISO-8859-1");
|
|
|
+ }
|
|
|
response.setHeader("Content-disposition", "attachment; filename=" + fileName);
|
|
|
response.setContentType("application/vnd.ms-excel; charset=utf-8");
|
|
|
response.setCharacterEncoding("UTF-8");
|