diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/ExcelCache.java b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/ExcelCache.java index b97bcd0..f15b13d 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/ExcelCache.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/ExcelCache.java @@ -34,14 +34,14 @@ public final class ExcelCache { } return wb; } catch (InvalidFormatException e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } catch (IOException e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } finally { try { is.close(); } catch (IOException e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } } return null; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/WordCache.java b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/WordCache.java index deb15db..8276f4a 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/WordCache.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/WordCache.java @@ -25,12 +25,12 @@ public class WordCache { MyXWPFDocument doc = new MyXWPFDocument(is); return doc; } catch (Exception e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } finally { try { is.close(); } catch (IOException e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } } return null; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/FileLoade.java b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/FileLoade.java index 9d0c463..93b81ee 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/FileLoade.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/FileLoade.java @@ -34,9 +34,9 @@ class FileLoade { baos.flush(); return baos.toByteArray(); } catch (FileNotFoundException e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } catch (IOException e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } finally { try { if (fileis != null) @@ -44,7 +44,7 @@ class FileLoade { if (fileis != null) baos.close(); } catch (IOException e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } } LOGGER.error(fileis + "这个路径文件没有找到,请查询"); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java index 007de41..a520a75 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/cache/manager/POICacheManager.java @@ -43,7 +43,7 @@ public final class POICacheManager { byte[] result = Arrays.copyOf(loadingCache.get(id), loadingCache.get(id).length); return new ByteArrayInputStream(result); } catch (ExecutionException e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } return null; } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java index cdd1d81..78669aa 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java @@ -219,7 +219,6 @@ public class ExcelExportServer extends ExcelExportBase { } } catch (Exception e) { - e.printStackTrace(); logger.error(e.getMessage(),e); throw new ExcelExportException(ExcelExportEnum.EXPORT_ERROR, e.getCause()); } diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java index 9b0578f..0441fbd 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -148,7 +148,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { addDataToSheet(params, pojoClass, dataSet, wb.getSheetAt(0), wb); } } catch (Exception e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); return null; } return wb; diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java b/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java index 958a92a..a705db4 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/word/parse/ParseWord07.java @@ -57,7 +57,7 @@ public class ParseWord07 { .getNextPicNameNumber((Integer) isAndType[1]), obj.getWidth(), obj.getHeight()); } catch (Exception e) { - LOGGER.error(e.getMessage(), e.fillInStackTrace()); + LOGGER.error(e.getMessage(),e); } } diff --git a/easypoi-test/.classpath b/easypoi-test/.classpath index cd3f839..7fbaeee 100644 --- a/easypoi-test/.classpath +++ b/easypoi-test/.classpath @@ -1,13 +1,13 @@ - + - + diff --git a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java b/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java index 2d19a8f..df2076b 100644 --- a/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java +++ b/easypoi-web/src/main/java/org/jeecgframework/poi/excel/view/JeecgTemplateExcelView.java @@ -7,6 +7,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Workbook; import org.jeecgframework.poi.excel.ExcelExportUtil; import org.jeecgframework.poi.excel.entity.TemplateExportParams; @@ -25,6 +26,9 @@ public class JeecgTemplateExcelView extends AbstractView { private static final String CONTENT_TYPE = "application/vnd.ms-excel"; + private static final String HSSF = ".xls"; + private static final String XSSF = ".xlsx"; + public JeecgTemplateExcelView() { setContentType(CONTENT_TYPE); } @@ -37,9 +41,19 @@ public class JeecgTemplateExcelView extends AbstractView { @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) throws Exception { - String codedFileName = "临时文件.xls"; + String codedFileName = "临时文件"; + Workbook workbook = ExcelExportUtil.exportExcel( + (TemplateExportParams) model.get(TemplateExcelConstants.PARAMS), + (Class) model.get(TemplateExcelConstants.CLASS), + (List) model.get(TemplateExcelConstants.LIST_DATA), + (Map) model.get(TemplateExcelConstants.MAP_DATA)); if (model.containsKey(NormalExcelConstants.FILE_NAME)) { - codedFileName = (String) model.get(NormalExcelConstants.FILE_NAME) + ".xls"; + codedFileName = (String) model.get(NormalExcelConstants.FILE_NAME); + } + if (workbook instanceof HSSFWorkbook) { + codedFileName += HSSF; + } else { + codedFileName += XSSF; } if (isIE(request)) { codedFileName = java.net.URLEncoder.encode(codedFileName, "UTF8"); @@ -47,11 +61,6 @@ public class JeecgTemplateExcelView extends AbstractView { codedFileName = new String(codedFileName.getBytes("UTF-8"), "ISO-8859-1"); } response.setHeader("content-disposition", "attachment;filename=" + codedFileName); - Workbook workbook = ExcelExportUtil.exportExcel( - (TemplateExportParams) model.get(TemplateExcelConstants.PARAMS), - (Class) model.get(TemplateExcelConstants.CLASS), - (List) model.get(TemplateExcelConstants.LIST_DATA), - (Map) model.get(TemplateExcelConstants.MAP_DATA)); ServletOutputStream out = response.getOutputStream(); workbook.write(out); out.flush(); diff --git a/pom.xml b/pom.xml index ab5d12b..646b674 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,33 @@ UTF-8 + + maven-source-plugin + 2.1 + + true + + + + compile + + jar + + + + + + + postaop-common-release + http://192.168.1.99:8081/nexus/content/repositories/postaop-common-release/ + + + postaop-common-snapshot + http://192.168.1.99:8081/nexus/content/repositories/postaop-common-snapshot/ + + + \ No newline at end of file