From 8460d17b074cb9a7cf3be238cd7089114077eb21 Mon Sep 17 00:00:00 2001 From: zhaojun <873019219@qq.com> Date: Fri, 5 Aug 2022 15:24:46 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E7=A7=BB=E5=8A=A8=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/enums/FileOperatorTypeEnum.java | 7 +--- .../zfile/common/cache/ZFileCache.java | 41 ------------------- .../home/aspect/FileOperatorCheckAspect.java | 13 ------ .../zfile/home/aspect/RefererCheckAspect.java | 4 +- .../model/request/SearchStorageRequest.java | 26 ------------ .../service/base/AbstractBaseFileService.java | 11 ----- 6 files changed, 3 insertions(+), 99 deletions(-) delete mode 100644 src/main/java/im/zhaojun/zfile/home/model/request/SearchStorageRequest.java diff --git a/src/main/java/im/zhaojun/zfile/admin/model/enums/FileOperatorTypeEnum.java b/src/main/java/im/zhaojun/zfile/admin/model/enums/FileOperatorTypeEnum.java index 250e26f..32dbbfe 100644 --- a/src/main/java/im/zhaojun/zfile/admin/model/enums/FileOperatorTypeEnum.java +++ b/src/main/java/im/zhaojun/zfile/admin/model/enums/FileOperatorTypeEnum.java @@ -42,12 +42,7 @@ public enum FileOperatorTypeEnum { /** * 移动文件&文件夹操作 */ - MOVE("移动", "move"), - - /** - * 搜索操作 - */ - SEARCH("搜索", "search"); + MOVE("移动", "move"); private final String name; diff --git a/src/main/java/im/zhaojun/zfile/common/cache/ZFileCache.java b/src/main/java/im/zhaojun/zfile/common/cache/ZFileCache.java index ce9d116..35e10c2 100644 --- a/src/main/java/im/zhaojun/zfile/common/cache/ZFileCache.java +++ b/src/main/java/im/zhaojun/zfile/common/cache/ZFileCache.java @@ -1,7 +1,6 @@ package im.zhaojun.zfile.common.cache; import cn.hutool.cache.impl.CacheObj; -import cn.hutool.core.util.StrUtil; import im.zhaojun.zfile.admin.model.dto.StorageSourceCacheKey; import im.zhaojun.zfile.admin.model.entity.StorageSource; import im.zhaojun.zfile.admin.service.StorageSourceService; @@ -13,7 +12,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -113,45 +111,6 @@ public class ZFileCache { } - /** - * 获取指定存储源中已缓存文件夹数量 - * - * @param storageId - * 存储源 ID - * - * @return 已缓存文件夹数量 - */ - public int cacheCount(Integer storageId) { - return getCacheByStorageId(storageId).size(); - } - - - /** - * 指定存储源, 根据文件及文件名查找相关的文件 - * - * @param storageId - * 存储源 ID - * - * @param key - * 搜索键, 可匹配文件夹名称和文件名称. - * - * @return 搜索结果, 包含文件夹和文件. - */ - public List find(Integer storageId, String key) { - return new ArrayList<>(); - } - - - private boolean testMatch(String searchKey, boolean ignoreCase, FileItemResult fileItemResult) { - // 根据是否需要忽略大小写来匹配文件(夹)名 - if (ignoreCase) { - return StrUtil.containsIgnoreCase(fileItemResult.getName(), searchKey); - } else { - return StrUtil.contains(fileItemResult.getName(), searchKey); - } - - } - /** * 获取所有缓存 key (文件夹名称) diff --git a/src/main/java/im/zhaojun/zfile/home/aspect/FileOperatorCheckAspect.java b/src/main/java/im/zhaojun/zfile/home/aspect/FileOperatorCheckAspect.java index be149c6..2a6ff25 100644 --- a/src/main/java/im/zhaojun/zfile/home/aspect/FileOperatorCheckAspect.java +++ b/src/main/java/im/zhaojun/zfile/home/aspect/FileOperatorCheckAspect.java @@ -79,19 +79,6 @@ public class FileOperatorCheckAspect { return check(point, FileOperatorTypeEnum.RENAME); } - /** - * 搜索功能权限校验 - * - * @param point - * 连接点 - * - * @return 方法运行结果 - */ - @Around("execution(public * im.zhaojun.zfile.home.service.base.AbstractBaseFileService.search(..))") - public Object searchAround(ProceedingJoinPoint point) throws Throwable { - return check(point, FileOperatorTypeEnum.SEARCH); - } - /** * 校验是否有此文件操作的权限 * diff --git a/src/main/java/im/zhaojun/zfile/home/aspect/RefererCheckAspect.java b/src/main/java/im/zhaojun/zfile/home/aspect/RefererCheckAspect.java index 3361757..b4049b4 100644 --- a/src/main/java/im/zhaojun/zfile/home/aspect/RefererCheckAspect.java +++ b/src/main/java/im/zhaojun/zfile/home/aspect/RefererCheckAspect.java @@ -22,7 +22,7 @@ import java.util.List; /** * 校验 referer 防盗链. - * + *

* 校验所有标注了 {@link RefererCheck} 的注解 * * @author zhaojun @@ -51,7 +51,7 @@ public class RefererCheckAspect { * * @return 方法运行结果 */ - @Around(value = "@annotation(im.zhaojun.zfile.admin.annoation.RefererCheck)") + @Around(value = "@annotation(im.zhaojun.zfile.admin.annotation.RefererCheck)") public Object around(ProceedingJoinPoint point) throws Throwable { // 获取配置的 referer 类型 SystemConfigDTO systemConfig = systemConfigService.getSystemConfig(); diff --git a/src/main/java/im/zhaojun/zfile/home/model/request/SearchStorageRequest.java b/src/main/java/im/zhaojun/zfile/home/model/request/SearchStorageRequest.java deleted file mode 100644 index 5065769..0000000 --- a/src/main/java/im/zhaojun/zfile/home/model/request/SearchStorageRequest.java +++ /dev/null @@ -1,26 +0,0 @@ -package im.zhaojun.zfile.home.model.request; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * 搜索存储源中文件请求参数 - * - * @author zhaojun - */ -@Data -@ApiModel(description = "搜索存储源中文件请求类") -public class SearchStorageRequest { - - @ApiModelProperty(value = "存储源 key", required = true, example = "local") - @NotBlank(message = "存储源 key 不能为空") - private String storageKey; - - @ApiModelProperty(value = "搜索 key", required = true, example = "png") - @NotBlank(message = "搜索 key 不能为空") - private String searchVal; - -} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/home/service/base/AbstractBaseFileService.java b/src/main/java/im/zhaojun/zfile/home/service/base/AbstractBaseFileService.java index 174d211..8234c1e 100644 --- a/src/main/java/im/zhaojun/zfile/home/service/base/AbstractBaseFileService.java +++ b/src/main/java/im/zhaojun/zfile/home/service/base/AbstractBaseFileService.java @@ -195,17 +195,6 @@ public abstract class AbstractBaseFileService

implement } - /** - * 搜索文件 - * - * @param name 文件名 - * @return 包含该文件名的所有文件或文件夹 - */ - public synchronized List search(String name) { - return zFileCache.find(storageId, name); - } - - /** * 获取单个文件信息 *