From ef861d48d69145692e5caba114123c47465b48c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E6=B2=90?= <babamu@126.com>
Date: Fri, 6 Oct 2023 15:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Excel=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../maku/framework/common/utils/ExcelUtils.java    | 40 ++++++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java b/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java
index 6228e95..3396508 100644
--- a/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java
+++ b/maku-framework/src/main/java/net/maku/framework/common/utils/ExcelUtils.java
@@ -23,6 +23,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -74,7 +75,7 @@ public class ExcelUtils {
      * @param <T>   数据类型
      * @param file  文件
      * @param clazz 模板类
-     * @return java.util.List list
+     * @return java.util.List
      */
     public static <T> List<T> readSync(File file, Class<T> clazz) {
         return readSync(file, clazz, 1, 0, ExcelTypeEnum.XLSX);
@@ -105,7 +106,7 @@ public class ExcelUtils {
      * @param data 数据
      */
     public static <T> void excelExport(Class<T> head, File file, List<T> data) {
-        excelExport(head, file, "sheet1" , data);
+        excelExport(head, file, "sheet1", data);
     }
 
     /**
@@ -137,11 +138,12 @@ public class ExcelUtils {
     public static <T> void excelExport(Class<T> head, String excelName, String sheetName, List<T> data) {
         try {
             HttpServletResponse response = HttpContextUtils.getHttpServletResponse();
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" );
-            response.setCharacterEncoding("utf-8" );
-            // 这里URLEncoder.encode可以防止中文乱码 当然和easy excel没有关系
-            String fileName = URLUtil.encode(excelName).replaceAll("\\+" , "%20" );
-            response.setHeader("Content-disposition" , "attachment;filename*=utf-8''" + fileName + ".xlsx" );
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+            response.setCharacterEncoding("UTF-8");
+            String fileName = URLUtil.encode(excelName, StandardCharsets.UTF_8);
+            response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+
             EasyExcel.write(response.getOutputStream(), head).sheet(StringUtils.isBlank(sheetName) ? "sheet1" : sheetName).doWrite(data);
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -149,6 +151,30 @@ public class ExcelUtils {
     }
 
     /**
+     * 导出数据到web
+     * 文件下载（失败了会返回一个有部分数据的Excel）
+     *
+     * @param head      类名
+     * @param excelName excel名字
+     * @param sheetName sheet名称
+     * @param data      数据
+     */
+    public static <T> void excelExport(List<List<String>> head, String excelName, String sheetName, List<T> data) {
+        try {
+            HttpServletResponse response = HttpContextUtils.getHttpServletResponse();
+            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+            response.setCharacterEncoding("UTF-8");
+            String fileName = URLUtil.encode(excelName, StandardCharsets.UTF_8);
+            response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+
+            EasyExcel.write(response.getOutputStream()).head(head).sheet(StringUtils.isBlank(sheetName) ? "sheet1" : sheetName).doWrite(data);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
      * 解析字典数据到字段上
      * 比如 T中有 genderLabel字段 为男 需要给 gender 字段自动设置为0
      *