From 2fa36b9d6aa1954b5fb3def44aa53bccf3b84fa2 Mon Sep 17 00:00:00 2001 From: Zhaoyang Date: Sun, 26 Apr 2020 09:37:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/diboot/file/controller/BaseFileController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/diboot-file-starter/src/main/java/com/diboot/file/controller/BaseFileController.java b/diboot-file-starter/src/main/java/com/diboot/file/controller/BaseFileController.java index 8ed345b..a31ee27 100644 --- a/diboot-file-starter/src/main/java/com/diboot/file/controller/BaseFileController.java +++ b/diboot-file-starter/src/main/java/com/diboot/file/controller/BaseFileController.java @@ -110,7 +110,7 @@ public abstract class BaseFileController extends BaseController { uploadFile.setUuid(fileUid).setFileName(originFileName).setFileType(ext); uploadFile.setRelObjType(entityClass.getSimpleName()).setStoragePath(storageFullPath); - String description = getString(request, "description"); + String description = getString("description"); uploadFile.setDescription(description); // 返回uploadFile对象 return uploadFile; From f8033900563e17f3497829506e4784ec24e02dcb Mon Sep 17 00:00:00 2001 From: Zhaoyang Date: Sun, 26 Apr 2020 09:40:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/diboot/file/controller/BaseExcelFileController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/diboot-file-starter/src/main/java/com/diboot/file/controller/BaseExcelFileController.java b/diboot-file-starter/src/main/java/com/diboot/file/controller/BaseExcelFileController.java index de1d126..56cab82 100644 --- a/diboot-file-starter/src/main/java/com/diboot/file/controller/BaseExcelFileController.java +++ b/diboot-file-starter/src/main/java/com/diboot/file/controller/BaseExcelFileController.java @@ -79,7 +79,7 @@ public abstract class BaseExcelFileController extends BaseFileController { String fullPath = FileHelper.getFullPath(previewFileName); String ext = FileHelper.getFileExtByName(originFileName); // 描述 - String description = getString(request, "description"); + String description = getString("description"); // 保存文件上传记录 UploadFile uploadFile = new UploadFile().setUuid(fileUid) .setFileName(originFileName).setStoragePath(fullPath).setFileType(ext) @@ -112,7 +112,7 @@ public abstract class BaseExcelFileController extends BaseFileController { UploadFile uploadFile = super.saveFile(file, getExcelDataListener().getExcelModelClass(), request); // 预览 FixedHeadExcelListener listener = getExcelDataListener(); - listener.setRequestParams(super.getParamsMap(request)); + listener.setRequestParams(super.getParamsMap()); try { ExcelHelper.previewReadExcel(uploadFile.getStoragePath(), listener); } @@ -143,7 +143,7 @@ public abstract class BaseExcelFileController extends BaseFileController { FixedHeadExcelListener listener = getExcelDataListener(); listener.setUploadFileUuid(fileUuid); listener.setPreview(false); - listener.setRequestParams(super.getParamsMap(request)); + listener.setRequestParams(super.getParamsMap()); try{ ExcelHelper.readAndSaveExcel(fullPath, listener); }