升级easypoi到v4.1.0，并解决poi包冲突问题

zlt2000 · Aug 12, 2019 · c72aeaa · c72aeaa
1 parent d857cc1
commit c72aeaa
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,8 @@
         <mybatis-plus-boot-starter.version>3.1.2</mybatis-plus-boot-starter.version>
         <aliyun-sdk-oss>3.4.2</aliyun-sdk-oss>
         <qiniu-java-sdk>7.2.18</qiniu-java-sdk>
-        <easypoi.version>4.0.0</easypoi.version>
+        <easypoi.version>4.1.0</easypoi.version>
+        <poi.version>4.1.0</poi.version>
         <spring-boot-admin.version>2.0.6</spring-boot-admin.version>
         <velocity.version>1.7</velocity.version>
         <commons-configuration.version>1.10</commons-configuration.version>
@@ -225,26 +226,20 @@
                 <artifactId>qiniu-java-sdk</artifactId>
                 <version>${qiniu-java-sdk}</version>
             </dependency>
-            <!--   easypoi   -->
             <dependency>
-                <groupId>cn.afterturn</groupId>
-                <artifactId>easypoi-base</artifactId>
-                <version>${easypoi.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.google.guava</groupId>
-                        <artifactId>guava</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>${poi.version}</version>
             </dependency>
             <dependency>
-                <groupId>cn.afterturn</groupId>
-                <artifactId>easypoi-web</artifactId>
-                <version>${easypoi.version}</version>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
             </dependency>
+            <!--   easypoi   -->
             <dependency>
                 <groupId>cn.afterturn</groupId>
-                <artifactId>easypoi-annotation</artifactId>
+                <artifactId>easypoi-base</artifactId>
                 <version>${easypoi.version}</version>
             </dependency>
             <dependency>

diff --git a/zlt-business/user-center/pom.xml b/zlt-business/user-center/pom.xml
@@ -63,15 +63,6 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>cn.afterturn</groupId>
-            <artifactId>easypoi-annotation</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.micrometer</groupId>
             <artifactId>micrometer-registry-prometheus</artifactId>

diff --git a/zlt-business/user-center/src/main/java/com/central/user/model/SysUserExcel.java b/zlt-business/user-center/src/main/java/com/central/user/model/SysUserExcel.java
@@ -24,7 +24,7 @@ public class SysUserExcel implements Serializable {
     @Excel(name = "手机号码", height = 20, width = 30, isImportField = "true_st")
     private String mobile;
 
-    @Excel(name = "学生性别", replace = { "男_0", "女_1" }, suffix = "生", isImportField = "true_st")
+    @Excel(name = "性别", replace = { "男_0", "女_1" }, isImportField = "true_st")
     private Integer sex;
 
     @Excel(name = "创建时间", format = CommonConstant.DATETIME_FORMAT, isImportField = "true_st", width = 20)

diff --git a/zlt-commons/zlt-common-spring-boot-starter/pom.xml b/zlt-commons/zlt-common-spring-boot-starter/pom.xml
@@ -54,6 +54,14 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
         <!--   easypoi   -->
         <dependency>
             <groupId>cn.afterturn</groupId>

diff --git a/...mons/zlt-common-spring-boot-starter/src/main/java/com/central/common/utils/ExcelUtil.java b/...mons/zlt-common-spring-boot-starter/src/main/java/com/central/common/utils/ExcelUtil.java
@@ -42,7 +42,7 @@ private ExcelUtil() {
      */
     public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName
             , boolean isCreateHeader, HttpServletResponse response) throws IOException {
-        ExportParams exportParams = new ExportParams(title, sheetName);
+        ExportParams exportParams = new ExportParams(title, sheetName, ExcelType.XSSF);
         exportParams.setCreateHeadRows(isCreateHeader);
         defaultExport(list, pojoClass, fileName, response, exportParams);
 
@@ -61,7 +61,7 @@ public static void exportExcel(List<?> list, String title, String sheetName, Cla
      */
     public static void exportExcel(List<?> list, String title, String sheetName, Class<?> pojoClass, String fileName
             , HttpServletResponse response) throws IOException {
-        defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName));
+        defaultExport(list, pojoClass, fileName, response, new ExportParams(title, sheetName, ExcelType.XSSF));
     }
 
     /**
@@ -93,7 +93,7 @@ private static void defaultExport(List<Map<String, Object>> list, String fileNam
 
     private static void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) throws IOException {
         response.setCharacterEncoding("UTF-8");
-        response.setHeader("content-Type", "application/vnd.ms-excel");
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
         workbook.write(response.getOutputStream());
     }

diff --git a/zlt-web/back-web/src/main/resources/static/pages/system/user.html b/zlt-web/back-web/src/main/resources/static/pages/system/user.html
@@ -150,12 +150,12 @@ <h2 class="header-title">用户管理</h2>
         $('#user-btn-export').click(function () {
             var url = config.base_server + 'api-user/users/export?access_token='+config.getToken().access_token;
             var xhr = new XMLHttpRequest();
-            xhr.open('GET', url, true);
+            xhr.open('POST', url, true);
             xhr.responseType = "blob";
             xhr.setRequestHeader("client_type", "DESKTOP_WEB");
             xhr.onload = function() {
                 if (this.status == 200) {
-                    var fileName = "user.xls";
+                    var fileName = "user.xlsx";
                     var blob = this.response;
                     var a = document.createElement('a');
                     a.innerHTML = fileName;