fix：修复文章图片无法保存的bug

Author: yqz

OpenBlog-business/src/main/java/com/yqz/openblog/media/controller/MediaController.java

@@ -39,8 +39,9 @@ public MediaController(MediaService mediaService) {
     @PostMapping(value = "/upload", produces = MediaType.APPLICATION_JSON_VALUE)
     public ApiResponse<MediaUploadResponse> upload(
             @RequestParam("file") MultipartFile file,
-            @RequestParam(required = false) Long folderId) throws IOException {
-        return ApiResponse.ok(mediaService.upload(file, folderId));
+            @RequestParam(required = false) Long folderId,
+            @RequestParam(required = false) String category) throws IOException {
+        return ApiResponse.ok(mediaService.upload(file, folderId, category));
     }
 
     @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)

OpenBlog-business/src/main/java/com/yqz/openblog/media/service/MediaService.java

@@ -31,11 +31,14 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Service
 public class MediaService {
 
+    private static final Pattern CATEGORY_PATTERN = Pattern.compile("^[a-z0-9][a-z0-9-]{0,63}$");
+
     private final MediaMapper mediaMapper;
     private final MediaProperties properties;
     private final CurrentUser currentUser;
@@ -57,7 +60,7 @@ public MediaService(MediaMapper mediaMapper,
         this.minioMediaStorage = minioMediaStorage;
     }
 
-    public MediaUploadResponse upload(MultipartFile file, Long folderId) throws IOException {
+    public MediaUploadResponse upload(MultipartFile file, Long folderId, String category) throws IOException {
         if (file == null || file.isEmpty()) {
             throw new BizException(4002, "文件不能为空");
         }
@@ -75,7 +78,7 @@ public MediaUploadResponse upload(MultipartFile file, Long folderId) throws IOEx
             throw new BizException(4002, "无法识别图片后缀");
         }
 
-        String cat = resolveFolderPrefix(folderId);
+        String cat = resolveStorageCategory(folderId, category);
         String key = cat + "/" + UUID.randomUUID().toString() + "." + ext;
         MediaStorage storage = activeStorage();
 
@@ -227,11 +230,18 @@ public List<MediaCategoryResponse> listCategories() {
                 .collect(Collectors.toList());
     }
 
-    private String resolveFolderPrefix(Long folderId) {
-        if (folderId == null) {
-            return "general";
+    private String resolveStorageCategory(Long folderId, String category) {
+        if (folderId != null) {
+            return "folder-" + folderId;
+        }
+        if (StringUtils.hasText(category)) {
+            String c = category.trim().toLowerCase(Locale.ROOT);
+            if (!CATEGORY_PATTERN.matcher(c).matches()) {
+                throw new BizException(4002, "无效的分类标识");
+            }
+            return c;
         }
-        return "folder-" + folderId;
+        return "general";
     }
 
     public void deleteMyMedia(String key) {

vue/src/api/media.js

@@ -7,10 +7,21 @@ function getAuthHeader() {
   return { Authorization: `Bearer ${token}` }
 }
 
-export async function uploadMedia(file, folderId) {
+export async function uploadMedia(file, folderIdOrOptions) {
   const fd = new FormData()
   fd.append('file', file)
+  let folderId = null
+  let category = null
+  if (folderIdOrOptions != null) {
+    if (typeof folderIdOrOptions === 'object') {
+      folderId = folderIdOrOptions.folderId ?? null
+      category = folderIdOrOptions.category ?? null
+    } else {
+      folderId = folderIdOrOptions
+    }
+  }
   if (folderId != null) fd.append('folderId', folderId)
+  if (category != null) fd.append('category', category)
 
   const res = await fetch(`${API_BASE}/api/v1/media/upload`, {
     method: 'POST',

vue/src/views/ConsoleArticleComposeView.vue

@@ -598,7 +598,7 @@ async function uploadAndInsert(file) {
 
   try {
 
-    const resp = await uploadMedia(file, 'article-body')
+    const resp = await uploadMedia(file, { category: 'article-body' })
 
     const md = `![${file.name || 'image'}](${resp.url})`
 
@@ -902,7 +902,7 @@ async function onPickCover(e) {
 
   articleError.value = ''
 
-  const resp = await uploadMedia(file, 'article-cover')
+  const resp = await uploadMedia(file, { category: 'article-cover' })
 
   form.value.coverMediaKey = resp.key