From 187544fc06bbbbdcb525c3131cc21f1ba40be709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BF=8A?= <873019219@qq.com>
Date: Sun, 19 Sep 2021 14:09:52 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=BD=93=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=97=B6=EF=BC=8C=E7=BB=99=E4=BA=88=E5=8F=8B=E5=A5=BD?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/im/zhaojun/zfile/controller/home/FileController.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/im/zhaojun/zfile/controller/home/FileController.java b/src/main/java/im/zhaojun/zfile/controller/home/FileController.java
index 78efb08..55b4d47 100644
--- a/src/main/java/im/zhaojun/zfile/controller/home/FileController.java
+++ b/src/main/java/im/zhaojun/zfile/controller/home/FileController.java
@@ -169,8 +169,10 @@ public class FileController {
                         FileItemDTO pwdFileItem = fileService.getFileItem(pwdFileFullPath);
                         expectedPasswordContent = HttpUtil.getTextContent(pwdFileItem.getUrl());
                     } catch (Exception e) {
-                        throw new PasswordVerifyException("此文件夹未加密文件夹, 但密码检查异常, 请联系管理员检查密码设置", e);
+                        throw new PasswordVerifyException("此文件夹为加密文件夹, 但密码检查异常, 请联系管理员检查密码设置", e);
                     }
+                } catch (Exception e) {
+                    throw new PasswordVerifyException("此文件夹为加密文件夹, 但密码检查异常, 请联系管理员检查密码设置", e);
                 }
 
                 if (matchPassword(expectedPasswordContent, inputPassword)) {