From 33c751ab336fb558bdce80cd81c58637146e59ac Mon Sep 17 00:00:00 2001
From: zhaojun <873019219@qq.com>
Date: Sat, 26 Nov 2022 17:59:52 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E4=B9=9F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=87=BA=E4=BA=86=E6=96=87=E4=BB=B6=E5=A4=B9=20readme=20?=
 =?UTF-8?q?=E7=9A=84=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/request/base/FileListConfigRequest.java     |  3 +++
 .../module/storage/service/StorageSourceService.java  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

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);
     }