diff --git a/front/components/UploadImage.vue b/front/components/UploadImage.vue
index 31f9da28..e74bb144 100644
--- a/front/components/UploadImage.vue
+++ b/front/components/UploadImage.vue
@@ -4,7 +4,7 @@
     <template #panel="{close}">
       <div class="p-4 flex flex-col gap-2">
         <div class="text-xs text-gray-400">本地上传</div>
-        <UInput type="file" size="sm" icon="i-heroicons-folder" @change="upload" multiple/>
+        <UInput type="file" size="sm" icon="i-heroicons-folder" accept="image/*" @change="upload" multiple/>
         <UTextarea :rows="5" placeholder="或者输入在线图片地址,逗号分隔,最多9张" v-model="imgs"/>
 
         <p v-if="filename" class="text-xs text-gray-400">正在上传({{ current }}/{{ total }})</p>
@@ -30,23 +30,21 @@ const filename = ref('')
 const total = ref(0)
 const current = ref(0)
 const upload = async (files: FileList) => {
-  for (let i = 0; i < files.length; i++) {
-    if (files[i].type.indexOf("image") < 0){
-      toast.error("只能上传图片");
-      return
-    }
+  const containsOtherFile = [...files].some(file => !file.type.startsWith('image/'))
+  if (containsOtherFile) {
+    toast.error("只能上传图片");
+    return
   }
+
   const result = await useUpload(files, (totalSize: number, index: number, name: string, p: number) => {
     progress.value = Math.round(p * 100)
     filename.value = name
     total.value = totalSize
     current.value = index
-  }) as string[]
-  toast.success("上传成功")
-  if (result) {
-    setTimeout(()=>{
-      imgs.value = (imgs.value ? imgs.value + ',' : '') + result.join(",")
-    },200)
+  })
+  if (result && result.length) {
+    toast.success("上传成功")
+    imgs.value = [imgs.value, ...result].filter(Boolean).join(',')
   }
 }
 
diff --git a/front/components/UploadVideo.vue b/front/components/UploadVideo.vue
index e63056ab..2993b2b7 100644
--- a/front/components/UploadVideo.vue
+++ b/front/components/UploadVideo.vue
@@ -108,9 +108,9 @@ const handleUploadVideo = async (files: FileList) => {
     filename.value = name
     total.value = totalSize
     current.value = index
-  }) as string[]
-  toast.success("上传成功")
-  if (result) {
+  })
+  if (result.length) {
+    toast.success("上传成功")
     onlineUrl.value = result[0]
   }
 }
diff --git a/front/pages/sys/settings.vue b/front/pages/sys/settings.vue
index 3803b63a..734d119f 100644
--- a/front/pages/sys/settings.vue
+++ b/front/pages/sys/settings.vue
@@ -154,8 +154,8 @@ const uploadFavicon = async (files: FileList) => {
     }
   }
   const result = await useUpload(files)
-  toast.success("上传成功")
-  if (result) {
+  if (result.length) {
+    toast.success("上传成功")
     state.favicon = result[0]
   }
 }
diff --git a/front/pages/user/settings.vue b/front/pages/user/settings.vue
index 6b05a68c..4cc522b9 100644
--- a/front/pages/user/settings.vue
+++ b/front/pages/user/settings.vue
@@ -73,8 +73,8 @@ const uploadAvatarUrl = async (files: FileList) => {
     }
   }
   const result = await useUpload(files)
-  toast.success("上传成功")
-  if (result) {
+  if (result.length) {
+    toast.success("上传成功")
     state.avatarUrl = result[0]
   }
 }
@@ -87,8 +87,8 @@ const uploadCoverUrl = async (files: FileList) => {
     }
   }
   const result = await useUpload(files)
-  toast.success("上传成功")
-  if (result) {
+  if (result.length) {
+    toast.success("上传成功")
     state.coverUrl = result[0]
   }
 }
diff --git a/front/utils/index.ts b/front/utils/index.ts
index 43d6d32e..5177b387 100644
--- a/front/utils/index.ts
+++ b/front/utils/index.ts
@@ -1,170 +1,226 @@
-import type {ResultVO, SysConfigVO} from "~/types";
-import {toast} from "vue-sonner";
-import {useGlobalState} from "~/store";
-import markdownit from "markdown-it";
-import { fromHighlighter } from '@shikijs/markdown-it/core'
-import { createHighlighterCore } from 'shiki/core'
-
+import type { ResultVO, SysConfigVO } from "~/types"
+import { toast } from "vue-sonner"
+import { useGlobalState } from "~/store"
+import markdownit from "markdown-it"
+import { fromHighlighter } from "@shikijs/markdown-it/core"
+import { createHighlighterCore } from "shiki/core"
 
 const global = useGlobalState()
 
-export async function useMyFetch<T>(url: string, data?: any) {
-    const userinfo = global.value.userinfo
-    const headers: Record<string, any> = {}
-    if (userinfo.token) {
-        headers["x-api-token"] = userinfo.token
-    }
-    try {
-        const res = await $fetch<ResultVO<T>>(`/api${url}`, {
-            method: "post",
-            body: data ? JSON.stringify(data) : null,
-            headers: headers
-        })
-        if (res.code !== 0) {
-            if (res.code === 3 || res.code === 4) {
-                global.value.userinfo = {}
-                window.location.href = '/'
-                throw new Error(res.message)
-            }
-            toast.error(res.message || "请求失败")
-            throw new Error(res.message)
-        }
-        return res.data
-    } finally {
+export const useMyFetch = async <T>(url: string, data?: any) => {
+  const headers: Record<string, string> = {}
+
+  const userinfo = global.value.userinfo
+  if (userinfo.token) {
+    headers["x-api-token"] = userinfo.token
+  }
+
+  const res = await $fetch<ResultVO<T>>(`/api${url}`, {
+    method: "post",
+    body: data ? JSON.stringify(data) : null,
+    headers: headers,
+  })
 
+  if (!res || res.code !== 0) {
+    if (!res) {
+      throw new Error("请求失败")
     }
-}
 
-async function upload2S3(files: FileList, onProgress: Function | undefined) {
-    const result = []
-    for (let i = 0; i < files.length; i++) {
-        const {preSignedUrl, imageUrl} = await useMyFetch<{
-            preSignedUrl: string,
-            imageUrl: string
-        }>('/file/s3PreSigned', {
-            contentType: files[0].type
-        })
-        await upload2S3WithProgress(preSignedUrl, files[i], (name: string, progress: number) => {
-            onProgress && onProgress(files.length, i + 1, name, progress)
-        })
-        result.push(imageUrl)
+    if (res.code === 3 || res.code === 4) {
+      global.value.userinfo = {}
+      window.location.href = "/"
+      throw new Error(res.message || "请求失败")
     }
-    return result
+
+    toast.error(res.message || "请求失败")
+    throw new Error(res.message)
+  }
+
+  return res.data
 }
 
-const upload2S3WithProgress = async (preSignedUrl: string, file: File, onProgress: Function) => {
-    new Promise((resolve, reject) => {
-        const xhr = new XMLHttpRequest();
-        xhr.upload.addEventListener('progress', e => onProgress(file.name, e.loaded / e.total));
-        xhr.addEventListener('load', () => {
-            if (xhr.responseType === 'json') {
-                return resolve(JSON.parse(xhr.responseText))
-            }
-            return resolve(null);
-        });
-        xhr.addEventListener('error', () => reject(new Error('File upload failed')));
-        xhr.addEventListener('abort', () => reject(new Error('File upload aborted')));
-        xhr.open('PUT', preSignedUrl, true);
-        //@ts-ignore
-        xhr.setRequestHeader('Content-Type', null);
-        xhr.send(file);
+type OnProgressCallback = (progress: number) => void
+
+type OnTotalProgressCallback = (
+  totalCount: number,
+  currentCount: number,
+  name: string,
+  progress: number,
+) => void
+
+const upload2S3WithProgress = async (
+  preSignedUrl: string,
+  file: File,
+  onProgress: OnProgressCallback,
+): Promise<void> =>
+  new Promise<void>((resolve, reject) => {
+    const xhr = new XMLHttpRequest()
+
+    xhr.addEventListener("load", () => {
+      resolve()
     })
+    xhr.addEventListener("error", () => reject(new Error("File upload failed")))
+    xhr.addEventListener("abort", () =>
+      reject(new Error("File upload aborted")),
+    )
+    xhr.upload.addEventListener("progress", e => onProgress(e.loaded / e.total))
+
+    xhr.open("PUT", preSignedUrl, true)
+    xhr.send(file)
+  })
+
+const upload2S3 = async (
+  files: FileList,
+  onProgress?: OnTotalProgressCallback,
+): Promise<string[]> => {
+  const result: string[] = []
+
+  for (let i = 0; i < files.length; i++) {
+    try {
+      const res = await useMyFetch<{
+        preSignedUrl: string
+        imageUrl: string
+      }>("/file/s3PreSigned", {
+        contentType: files[0].type,
+      })
+
+      if (!res || !res.preSignedUrl) {
+        toast.error("获取 S3 上传地址失败")
+        continue
+      }
+
+      const file = files[i]
+      await upload2S3WithProgress(res.preSignedUrl, file, progress => {
+        if (onProgress) {
+          onProgress(files.length, i + 1, file.name, progress)
+        }
+      })
+      result.push(res.imageUrl)
+    } catch (err) {
+      toast.error(`上传图片到 S3 失败, ${err}`)
+    }
+  }
+
+  return result
 }
 
+const uploadFile2ServerWithProgress = (
+  url: string,
+  file: File,
+  onProgress: OnProgressCallback,
+): Promise<string[]> =>
+  new Promise<string[]>((resolve, reject) => {
+    const xhr = new XMLHttpRequest()
+
+    xhr.addEventListener("load", () => {
+      const res = JSON.parse(xhr.responseText)
+      if (!res || res.code !== 0) {
+        return reject(new Error(`${res?.message || "请求失败"}`))
+      }
+
+      resolve(res.data || [])
+    })
+    xhr.addEventListener("error", () => reject(new Error("File upload failed")))
+    xhr.addEventListener("abort", () =>
+      reject(new Error("File upload aborted")),
+    )
+    xhr.upload.addEventListener("progress", e => onProgress(e.loaded / e.total))
 
-export async function useUpload(files: FileList | null, onProgress: Function | undefined = undefined) {
-    const sysConfig = useState<SysConfigVO>('sysConfig')
-    const result = []
-    if (!files || files.length === 0) {
-        toast.error("没有选择文件")
-        return
-    }
+    xhr.open("POST", url, true)
 
     const userinfo = global.value.userinfo
-    const headers: Record<string, any> = {}
     if (userinfo.token) {
-        headers["x-api-token"] = userinfo.token
+      xhr.setRequestHeader("x-api-token", userinfo.token)
     }
 
-    if (sysConfig.value.enableS3) {
-        return await upload2S3(files, onProgress)
-    }
-    for (let i = 0; i < files.length; i++) {
-        try {
-            const res = await uploadFiles('/api/file/upload', files[i], (name: string, progress: number) => {
-                onProgress && onProgress(files.length, i + 1, name, progress)
-            }) as {
-                code: number,
-                data: string[],
-                message: string
-            }
-            if (res.code !== 0) {
-                toast.error(res.message || "请求失败")
-                throw new Error(res.message)
-            }
-            result.push(...res.data)
-        } catch (e) {
-            if (e instanceof Error) {
-                throw new Error(e.message)
-            }
-            throw new Error("接口异常")
-        }
-    }
-    return result
-}
+    const formData = new FormData()
+    formData.append("files", file)
 
+    xhr.send(formData)
+  })
 
-export const uploadFiles = (url: string, file: File, onProgress: Function) =>
-    new Promise((resolve, reject) => {
-        const userinfo = global.value.userinfo
-        const xhr = new XMLHttpRequest();
-        xhr.upload.addEventListener('progress', e => onProgress(file.name, e.loaded / e.total));
-        xhr.addEventListener('load', () => resolve(JSON.parse(xhr.responseText)));
-        xhr.addEventListener('error', () => reject(new Error('File upload failed')));
-        xhr.addEventListener('abort', () => reject(new Error('File upload aborted')));
-        xhr.open('POST', url, true);
-        if (userinfo.token) {
-            xhr.setRequestHeader('x-api-token', userinfo.token);
-        }
-        const formData = new FormData();
-        formData.append("files", file)
-        xhr.send(formData);
-    });
+const uploadFile2Server = async (
+  files: FileList,
+  onProgress?: OnTotalProgressCallback,
+): Promise<string[]> => {
+  const result: string[] = []
 
+  for (let i = 0; i < files.length; i++) {
+    try {
+      const file = files[i]
+      const urlList = await uploadFile2ServerWithProgress(
+        "/api/file/upload",
+        file,
+        progress => {
+          if (onProgress) {
+            onProgress(files.length, i + 1, file.name, progress)
+          }
+        },
+      )
+
+      if (!urlList.length) {
+        toast.error(`上传图片到服务器失败`)
+        continue
+      }
+
+      result.push(...urlList)
+    } catch (e) {
+      toast.error(`上传图片到服务器失败, ${e}`)
+    }
+  }
+
+  return result
+}
+
+export const useUpload = async (
+  files: FileList,
+  onProgress?: OnTotalProgressCallback,
+): Promise<string[]> => {
+  if (files.length === 0) {
+    toast.error("没有选择文件")
+    return []
+  }
+
+  const sysConfig = useState<SysConfigVO>("sysConfig")
+  if (sysConfig.value.enableS3) {
+    return upload2S3(files, onProgress)
+  }
+
+  return uploadFile2Server(files, onProgress)
+}
 
 export const md = markdownit({
-    html: true,
-    linkify: true,
-    typographer: true,
-    breaks: true,
+  html: true,
+  linkify: true,
+  typographer: true,
+  breaks: true,
 })
 
 createHighlighterCore({
-    themes: [
-        import('shiki/themes/github-dark.mjs')
-    ],
-    langs: [
-        import('shiki/langs/c.mjs'),
-        import('shiki/langs/css.mjs'),
-        import('shiki/langs/html.mjs'),
-        import('shiki/langs/javascript.mjs'),
-        import('shiki/langs/json.mjs'),
-        import('shiki/langs/python.mjs'),
-        import('shiki/langs/shellscript.mjs'),
-        import('shiki/langs/sql.mjs'),
-        import('shiki/langs/tsx.mjs'),
-        import('shiki/langs/xml.mjs'),
-        import('shiki/langs/yaml.mjs'),
-        import('shiki/langs/go.mjs'),
-    ],
-    loadWasm: import('shiki/wasm')
-}).then((highlighter)=>{
+  themes: [import("shiki/themes/github-dark.mjs")],
+  langs: [
+    import("shiki/langs/c.mjs"),
+    import("shiki/langs/css.mjs"),
+    import("shiki/langs/html.mjs"),
+    import("shiki/langs/javascript.mjs"),
+    import("shiki/langs/json.mjs"),
+    import("shiki/langs/python.mjs"),
+    import("shiki/langs/shellscript.mjs"),
+    import("shiki/langs/sql.mjs"),
+    import("shiki/langs/tsx.mjs"),
+    import("shiki/langs/xml.mjs"),
+    import("shiki/langs/yaml.mjs"),
+    import("shiki/langs/go.mjs"),
+  ],
+  loadWasm: import("shiki/wasm"),
+}).then(highlighter => {
+  md.use(
     //@ts-ignore
-    md.use(fromHighlighter(highlighter, {
-        themes: {
-            light: 'github-dark',
-            dark: 'github-dark',
-        }
-    }))
+    fromHighlighter(highlighter, {
+      themes: {
+        light: "github-dark",
+        dark: "github-dark",
+      },
+    }),
+  )
 })
-