[DEV] 文] file upload bug fixed

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/FileUploadAdapter.java

@@ -58,7 +58,7 @@ public class FileUploadAdapter {
         if (paramBean.totalSize > Long.valueOf(maxFileSize))
             return ResponseEntity.badRequest().body("InvalidFileSize");
         String baseFolder = prepareFolder();
-        if (!Utils.isEmpty(baseFolder)) return ResponseEntity.badRequest().body("PrepareFolderError");
+        if (Utils.isEmpty(baseFolder)) return ResponseEntity.badRequest().body("PrepareFolderError");
 
         String tempPath = String.format("%s" + File.separator + "%s", baseFolder, paramBean.tempFileName);
         String completePath = String.format("%s" + File.separator + "%s", baseFolder, paramBean.tempFileName);
@@ -74,11 +74,11 @@ public class FileUploadAdapter {
             }
 
             try (FileOutputStream fos = new FileOutputStream(new File(tempPath));
-                 InputStream inputStream = request.getFile(FILE_NAME).getInputStream();) {
+                 InputStream inputStream = request.getFileMap().get("file").getInputStream();) {
 
                 byte[] buffer = new byte[4096];
                 int bytesRead;
-                while ((bytesRead = inputStream.read(buffer, 0, buffer.length)) != 0) {
+                while ((bytesRead = inputStream.read(buffer, 0, buffer.length)) > 0) {
                     fos.write(buffer, 0, bytesRead);
                 }
 
@@ -127,7 +127,7 @@ public class FileUploadAdapter {
     }
 
     private String prepareFolder() {
-        String uploadFolder = String.format("~/%s", UPLOAD_FOLDER_NAME);
+        String uploadFolder = String.format("~"+File.separator+"%s", UPLOAD_FOLDER_NAME);
         if (containsSubFolder) {
             Calendar now = Calendar.getInstance();
             now.setTime(new Date());