From bf3c20f937f04299c5f9d289bbfe43c3853649fa Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Sun, 18 Jul 2021 23:11:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E6=A1=86=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/file/controller/MediaController.java  |  2 +-
 .../framework/file/service/AttachmentService.java   | 13 ++++++++++++-
 .../framework/file/service/MediaService.java        |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/controller/MediaController.java b/flyfish-file/src/main/java/com/flyfish/framework/file/controller/MediaController.java
index 345a65a..0ece11d 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/controller/MediaController.java
+++ b/flyfish-file/src/main/java/com/flyfish/framework/file/controller/MediaController.java
@@ -49,7 +49,7 @@ public class MediaController {
 
     @GetMapping("/**")
     public Mono<Void> downloadMedia(ServerHttpRequest request, ServerHttpResponse response) {
-        String path = StringUtils.substringAfter(request.getURI().getPath(), "/media");
+        String path = StringUtils.substringAfter(request.getURI().getPath(), "/medias");
         return DownloadUtils.download(configuration.getLocalPath() + path, response);
     }
 
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/service/AttachmentService.java b/flyfish-file/src/main/java/com/flyfish/framework/file/service/AttachmentService.java
index ab20d5d..c1dfe5d 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/service/AttachmentService.java
+++ b/flyfish-file/src/main/java/com/flyfish/framework/file/service/AttachmentService.java
@@ -4,6 +4,7 @@ package com.flyfish.framework.file.service;
 import com.flyfish.framework.file.domain.Attachment;
 import com.flyfish.framework.file.utils.FileSizeUtils;
 import com.flyfish.framework.service.impl.BaseServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.codec.multipart.FilePart;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
@@ -24,6 +25,16 @@ public class AttachmentService extends BaseServiceImpl<Attachment> {
      * @return 结果
      */
     public Mono<Attachment> upload(FilePart part) {
+        return upload(part, null);
+    }
+
+    /**
+     * 上传媒体文件
+     *
+     * @param part 文件
+     * @return 结果
+     */
+    public Mono<Attachment> upload(FilePart part, String name) {
         return fileService.saveLocal(part)
                 .map(path -> {
                     Attachment attachment = Attachment.builder()
@@ -31,7 +42,7 @@ public class AttachmentService extends BaseServiceImpl<Attachment> {
                             .path(path)
                             .url(URL + path)
                             .build();
-                    attachment.setName(part.filename());
+                    attachment.setName(StringUtils.isNotBlank(name) ? name : part.filename());
                     return create(attachment);
                 });
     }
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/service/MediaService.java b/flyfish-file/src/main/java/com/flyfish/framework/file/service/MediaService.java
index 349f94a..a31896a 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/service/MediaService.java
+++ b/flyfish-file/src/main/java/com/flyfish/framework/file/service/MediaService.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 @Slf4j
 public class MediaService {
 
-    private static String URL = "/api/media/";
+    private static String URL = "/api/medias/";
     @Resource
     private FileService fileService;
     @Resource