Merge branch 'cherry-pick-2a633fe8' into 'master_dev'

fix:文件上传返回路径双斜杆//替换成单斜杆/

See merge request yunteng/thingskit!467

@@ -49,12 +49,12 @@ public class LocalFileStorageService implements FileStorageService {
   public LocalFileStorageService(FileStorageProperties fileStorageProperties) {
   public LocalFileStorageService(FileStorageProperties fileStorageProperties) {
     this.fileStorageProperties = fileStorageProperties;
     this.fileStorageProperties = fileStorageProperties;
     this.fileStorageLocation =
     this.fileStorageLocation =
-        Paths.get(fileStorageProperties.getUploadDir()).toAbsolutePath().normalize();
+            Paths.get(fileStorageProperties.getUploadDir()).toAbsolutePath().normalize();
     try {
     try {
       Files.createDirectories(this.fileStorageLocation);
       Files.createDirectories(this.fileStorageLocation);
     } catch (Exception e) {
     } catch (Exception e) {
       throw new RuntimeException(
       throw new RuntimeException(
-          "Could not create the directory where the uploaded files will be stored.");
+              "Could not create the directory where the uploaded files will be stored.");
     }
     }
   }
   }
 
 
@@ -86,19 +86,18 @@ public class LocalFileStorageService implements FileStorageService {
   @Override
   @Override
   public FileUploadResponse upload(MultipartFile file) {
   public FileUploadResponse upload(MultipartFile file) {
     String fileName = this.storeFile(file);
     String fileName = this.storeFile(file);
-//    String fileDownloadPath = ServletUriComponentsBuilder.fromCurrentRequestUri() .path(fileStorageProperties.getDownloadPath()) .path(fileName) .toUriString();
-    String fileDownloadPath = fileStorageProperties.getDownloadPath()+"/"+fileName;
-    String realDownloadPath = fileDownloadPath.replace(fileStorageProperties.getUploadPath(), "");
+    String fileDownloadPath = fileStorageProperties.getDownloadPath() + "/" + fileName;
+    String realDownloadPath = fileDownloadPath.replace(fileStorageProperties.getUploadPath(), "").replace("//", "/").replace("\\","/");
 
 
     String ossStaticPath = ServletUriComponentsBuilder.fromCurrentContextPath().toUriString() + ossFileUrl;
     String ossStaticPath = ServletUriComponentsBuilder.fromCurrentContextPath().toUriString() + ossFileUrl;
-    ossStaticPath = ossStaticPath.replace("**", fileName);
+    ossStaticPath = ossStaticPath.replace("**", fileName).replace("//", "/").replace("\\","/");
     return new FileUploadResponse(
     return new FileUploadResponse(
-        fileName, ossStaticPath, file.getContentType(), file.getSize(),  realDownloadPath);
+            fileName, ossStaticPath, file.getContentType(), file.getSize(), realDownloadPath);
   }
   }
 
 
   @Override
   @Override
   public ResponseEntity<?> download(
   public ResponseEntity<?> download(
-      String fileName, HttpServletRequest request, HttpServletResponse response) {
+          String fileName, HttpServletRequest request, HttpServletResponse response) {
     Resource resource = this.loadFileAsResource(fileName);
     Resource resource = this.loadFileAsResource(fileName);
     String contentType = null;
     String contentType = null;
     try {
     try {
@@ -113,35 +112,35 @@ public class LocalFileStorageService implements FileStorageService {
     }
     }
 
 
     return ResponseEntity.ok()
     return ResponseEntity.ok()
-        .contentType(MediaType.parseMediaType(contentType))
-        .header(
-            HttpHeaders.CONTENT_DISPOSITION,
-            "attachment; filename=\"" + resource.getFilename() + "\"")
-        .body(resource);
+            .contentType(MediaType.parseMediaType(contentType))
+            .header(
+                    HttpHeaders.CONTENT_DISPOSITION,
+                    "attachment; filename=\"" + resource.getFilename() + "\"")
+            .body(resource);
   }
   }
 
 
   @Override
   @Override
   public InputStream download(String file) throws IOException {
   public InputStream download(String file) throws IOException {
-    String fileName=file.substring(file.lastIndexOf("/")+1);
-    String filePath=fileStorageProperties.getUploadDir()+File.separator+ fileName;
-     return new FileInputStream(new File(filePath));
+    String fileName = file.substring(file.lastIndexOf("/") + 1);
+    String filePath = fileStorageProperties.getUploadDir() + File.separator + fileName;
+    return new FileInputStream(new File(filePath));
   }
   }
 
 
   @Override
   @Override
-  public String uploadFile(String name, String contentType, InputStream inputStream )
-      throws IOException {
+  public String uploadFile(String name, String contentType, InputStream inputStream)
+          throws IOException {
     String fileName = storeFileByInputStream(name, inputStream);
     String fileName = storeFileByInputStream(name, inputStream);
-    String fileDownloadPath = fileStorageProperties.getDownloadPath()+"/"+fileName;
-    String realDownloadPath = fileDownloadPath.replace(fileStorageProperties.getUploadPath(), "");
+    String fileDownloadPath = fileStorageProperties.getDownloadPath() + "/" + fileName;
+    String realDownloadPath = fileDownloadPath.replace(fileStorageProperties.getUploadPath(), "").replace("//", "/").replace("\\","/");
     return realDownloadPath;
     return realDownloadPath;
   }
   }
 
 
   @Override
   @Override
   public boolean deleteFile(String deleteFilePath) {
   public boolean deleteFile(String deleteFilePath) {
-    String fileName=deleteFilePath.substring(deleteFilePath.lastIndexOf("/")+1);
-    String filePath=fileStorageProperties.getUploadDir()+File.separator+ fileName;
-    File file=new File(filePath);
-    if(file.exists()){
+    String fileName = deleteFilePath.substring(deleteFilePath.lastIndexOf("/") + 1);
+    String filePath = fileStorageProperties.getUploadDir() + File.separator + fileName;
+    File file = new File(filePath);
+    if (file.exists()) {
       file.delete();
       file.delete();
       return true;
       return true;
     }
     }
@@ -150,12 +149,12 @@ public class LocalFileStorageService implements FileStorageService {
 
 
 
 
   private String storeFileByInputStream(String fileName, InputStream inputStream)
   private String storeFileByInputStream(String fileName, InputStream inputStream)
-      throws IOException {
+          throws IOException {
     // random fileName if needed
     // random fileName if needed
     if (fileStorageProperties.isRandomFileName()) {
     if (fileStorageProperties.isRandomFileName()) {
       if (fileName.contains(".")) {
       if (fileName.contains(".")) {
         fileName =
         fileName =
-            RandomStringUtils.randomAlphabetic(15) + fileName.substring(fileName.lastIndexOf("."));
+                RandomStringUtils.randomAlphabetic(15) + fileName.substring(fileName.lastIndexOf("."));
       } else {
       } else {
         fileName = RandomStringUtils.randomAlphabetic(15);
         fileName = RandomStringUtils.randomAlphabetic(15);
       }
       }
@@ -173,4 +172,9 @@ public class LocalFileStorageService implements FileStorageService {
 
 
     return fileName;
     return fileName;
   }
   }
-}
+
+  public static void main(String[] args) {
+    String s = "a/b//c//d\\eec";
+    System.err.println(s.replace("//", "/").replace("\\","/"));
+  }
+}