From 57aeb5771c684e35bc6196b1dc1bfa5bd0d58edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=BF=8A?= <873019219@qq.com> Date: Sun, 30 May 2021 17:39:40 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E9=A9=B1=E5=8A=A8=E5=99=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E8=BF=94=E5=9B=9E=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E5=B7=B2=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zfile/controller/home/FileController.java | 5 ++++- .../zhaojun/zfile/model/dto/DriveListDTO.java | 21 +++++++++++++++++++ .../zfile/service/SystemConfigService.java | 11 ++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 src/main/java/im/zhaojun/zfile/model/dto/DriveListDTO.java 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 20c98df..78efb08 100644 --- a/src/main/java/im/zhaojun/zfile/controller/home/FileController.java +++ b/src/main/java/im/zhaojun/zfile/controller/home/FileController.java @@ -68,7 +68,10 @@ public class FileController { */ @GetMapping("/drive/list") public ResultBean drives() { - return ResultBean.success(driveConfigService.listOnlyEnable()); + List driveList = driveConfigService.listOnlyEnable(); + boolean isInstall = systemConfigService.getIsInstall(); + DriveListDTO driveListDTO = new DriveListDTO(driveList, isInstall); + return ResultBean.success(driveListDTO); } /** diff --git a/src/main/java/im/zhaojun/zfile/model/dto/DriveListDTO.java b/src/main/java/im/zhaojun/zfile/model/dto/DriveListDTO.java new file mode 100644 index 0000000..9bac8b5 --- /dev/null +++ b/src/main/java/im/zhaojun/zfile/model/dto/DriveListDTO.java @@ -0,0 +1,21 @@ +package im.zhaojun.zfile.model.dto; + +import im.zhaojun.zfile.model.entity.DriveConfig; +import lombok.AllArgsConstructor; +import lombok.Data; + +import java.util.List; + +/** + * @author Zhao Jun + * 2021/5/26 15:17 + */ +@Data +@AllArgsConstructor +public class DriveListDTO { + + private List driveList; + + private Boolean isInstall; + +} \ No newline at end of file diff --git a/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java b/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java index 09b5790..bbd0d65 100644 --- a/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java +++ b/src/main/java/im/zhaojun/zfile/service/SystemConfigService.java @@ -1,6 +1,7 @@ package im.zhaojun.zfile.service; import cn.hutool.core.convert.Convert; +import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import im.zhaojun.zfile.cache.ZFileCache; import im.zhaojun.zfile.exception.InvalidDriveException; @@ -173,4 +174,14 @@ public class SystemConfigService { return systemConfigDTO.getDomain(); } + + /** + * 获取是否已安装初始化 + * + * @return 是否已安装初始化 + */ + public boolean getIsInstall() { + SystemConfigDTO systemConfigDTO = getSystemConfig(); + return StrUtil.isNotEmpty(systemConfigDTO.getUsername()); + } } \ No newline at end of file