diff --git a/src/main/java/im/zhaojun/zfile/module/storage/model/request/base/FileListConfigRequest.java b/src/main/java/im/zhaojun/zfile/module/storage/model/request/base/FileListConfigRequest.java index 5b3801e..2e3e3bb 100644 --- a/src/main/java/im/zhaojun/zfile/module/storage/model/request/base/FileListConfigRequest.java +++ b/src/main/java/im/zhaojun/zfile/module/storage/model/request/base/FileListConfigRequest.java @@ -21,5 +21,8 @@ public class FileListConfigRequest { @ApiModelProperty(value = "请求路径", example = "/") private String path = "/"; + + @ApiModelProperty(value = "文件夹密码", example = "123456") + private String password; } \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/module/storage/service/StorageSourceService.java b/src/main/java/im/zhaojun/zfile/module/storage/service/StorageSourceService.java index 3170e60..3b3b1fb 100644 --- a/src/main/java/im/zhaojun/zfile/module/storage/service/StorageSourceService.java +++ b/src/main/java/im/zhaojun/zfile/module/storage/service/StorageSourceService.java @@ -361,8 +361,17 @@ public class StorageSourceService { // 根据存储源 key 获取存储源 id Integer storageId = storageSource.getId(); + VerifyResultDTO verifyPassword = passwordConfigService.verifyPassword(storageId, path, fileListConfigRequest.getPassword()); + + ReadmeConfig readmeByPath = null; + if (verifyPassword.isPassed()) { + // 获取指定存储源路径下的 readme 信息 + readmeByPath = readmeConfigService.getByStorageAndPath(storageId, path, storageSource.getCompatibilityReadme()); + } else { + log.info("文件夹密码验证失败,不获取 readme 信息, storageId: {}, path: {}, password: {}", storageId, path, fileListConfigRequest.getPassword()); + } + // 获取指定存储源路径下的 readme 信息 - ReadmeConfig readmeByPath = readmeConfigService.getByStorageAndPath(storageId, path, storageSource.getCompatibilityReadme()); return storageSourceConvert.entityToConfigResult(storageSource, readmeByPath); }