diff --git a/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue index b3ec414b..5a23508a 100644 --- a/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue +++ b/io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue @@ -37,7 +37,6 @@
- + @@ -69,7 +69,7 @@ const importData = () => { { datasource: formDataRef.datasource, deleteFirst: formDataRef.deleteFirst, - files: fileRef.value.nativeEl.files[0], + files: fileRef.value.nativeEl.files, }, { headers: { diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcDataWebController.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcDataWebController.java index 29f0d24e..d45a53dd 100644 --- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcDataWebController.java +++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/controller/JdbcDataWebController.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.util.Locale; @RestController @@ -21,15 +22,16 @@ public class JdbcDataWebController { @PostMapping("importData") public void importData( + HttpServletRequest request, + Locale locale, @RequestParam(name="datasource",required = false) String datasource, @RequestParam(name="deleteFirst", required = false) boolean deleteFirst, - @RequestPart(name="files",required = false) MultipartFile multipartFile, - Locale locale) throws Exception + @RequestPart(name="files[]") MultipartFile[] multipartFiles) throws Exception { DataImportConfigure configure =new DataImportConfigure(); configure.setDatasource(datasource); configure.setDeleteFirst(deleteFirst); - configure.addFile(multipartFile); + configure.addFile(multipartFiles); ImporterThread thread =new ImporterThread(jdbcDataService,configure,locale); progressableThreadService.start(thread); diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataImportConfigure.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataImportConfigure.java index 3168f980..3374e455 100644 --- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataImportConfigure.java +++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/exporter/support/DataImportConfigure.java @@ -10,12 +10,15 @@ public class DataImportConfigure { private boolean deleteFirst; private List files =new ArrayList<>(); - public DataImportConfigure addFile(MultipartFile file){ - this.files.add(file); + public DataImportConfigure addFile(MultipartFile... files){ + if(files!=null && files.length>0){ + for(MultipartFile file : files){ + this.files.add(file); + } + } return this; } - public String getDatasource() { return datasource; } diff --git a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/support/FileDownloader.java b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/support/FileDownloader.java index 45b3c2d4..ae73a69a 100644 --- a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/support/FileDownloader.java +++ b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/support/FileDownloader.java @@ -34,7 +34,7 @@ public class FileDownloader { BufferedInputStream bis = null; BufferedOutputStream bos = null; try { - bis = new BufferedInputStream(inputStream); + bis = new BufferedInputStream(inputStream); bos = new BufferedOutputStream(response.getOutputStream()); byte[] buff = new byte[2048]; int bytesRead;