diff --git a/admin-ui/src/auto/components/WFileUploader.vue b/admin-ui/src/auto/components/WFileUploader.vue index 5332ccf..dbe9517 100644 --- a/admin-ui/src/auto/components/WFileUploader.vue +++ b/admin-ui/src/auto/components/WFileUploader.vue @@ -147,6 +147,21 @@ const mv = computed({ emit("change", value) } }) + +watch(mv, () => { + if (props.max == 1) { + data.value = [] + if (mv.value) { + data.value = [{ url: mv.value ,ext: getExt(mv.value), name: getName(mv.value) }] + } + } else { + data.value = [] + if (mv.value) { + data.value = mv.value.map(a => ({ url: a ,ext: getExt(a), name: getName(a)})) + } + } +}) + const uploading = computed({ get() { return props.uploading diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java index fda2462..c58e385 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java @@ -2,6 +2,7 @@ package com.ruoyi.common.utils.file; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.UUID; +import cn.hutool.core.util.StrUtil; import com.ruoyi.common.utils.redis.RedisUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -57,6 +58,7 @@ public class FileUtils extends FileUtil { /** * 获取上传凭证 + * * @param duration 有效期 * @return */ @@ -68,6 +70,7 @@ public class FileUtils extends FileUtil { /** * 获取上传凭证,有效期30分钟 + * * @return */ public static String getUploadKey() { @@ -76,18 +79,26 @@ public class FileUtils extends FileUtil { /** * 检查上传凭证是否存在 + * * @param key * @return */ - public static boolean exitisUploadKey(String key){ + public static boolean exitisUploadKey(String key) { + if (StrUtil.isBlank(key)) { + return false; + } return RedisUtils.isExistsObject(UPLOAD_KEY_PREFIX + key); } /** * 删除上传凭证 + * * @param key */ - public static void removeUploadKey(String key){ + public static void removeUploadKey(String key) { + if (StrUtil.isBlank(key)) { + return ; + } RedisUtils.deleteObject(UPLOAD_KEY_PREFIX + key); } }