From 4bca6cf7a5f76b707110349589f21dfb51316aa8 Mon Sep 17 00:00:00 2001 From: zhaojun1998 Date: Tue, 28 Jan 2020 13:13:52 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E7=A7=BB=E9=99=A4=E5=B0=BE?= =?UTF-8?q?=E9=83=A8=E8=AF=B4=E6=98=8E=E6=96=87=E4=BB=B6=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- .../common/controller/FileController.java | 1 - .../common/model/constant/ZFileConstant.java | 10 ----- .../common/model/dto/SiteConfigDTO.java | 38 ++----------------- .../zhaojun/common/service/SystemService.java | 4 +- ...itional-spring-configuration-metadata.json | 6 --- src/main/resources/application.yml | 1 - 7 files changed, 6 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index c14e9fe..17744b6 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ * 内存缓存 (免安装) * 内存数据库 (免安装) * 个性化配置 -* 自定义目录的 header 和 footer 说明文件 +* 自定义目录的 header 说明文件 * 文件夹密码 * 支持在线浏览文本文件, 视频, 图片, 音乐. (支持 FLV 和 HLS) * 文件/目录二维码 @@ -93,7 +93,6 @@ nohup java -Djava.security.egd=file:/dev/./urandom -jar zfile-0.7.1.jar & ### 头尾文件和加密文件 - 目录头部显示文件名为 `header.md` -- 目录底部显示文件名为 `footer.md` - 目录需要密码访问, 添加文件 `password.txt` (无法拦截此文件被下载, 但可以改名文件) ## TODO diff --git a/src/main/java/im/zhaojun/common/controller/FileController.java b/src/main/java/im/zhaojun/common/controller/FileController.java index 3a4a8cf..a18aaac 100644 --- a/src/main/java/im/zhaojun/common/controller/FileController.java +++ b/src/main/java/im/zhaojun/common/controller/FileController.java @@ -112,7 +112,6 @@ public class FileController { } fileItemList.removeIf(fileItem -> ZFileConstant.PASSWORD_FILE_NAME.equals(fileItem.getName()) - || ZFileConstant.FOOTER_FILE_NAME.equals(fileItem.getName()) || ZFileConstant.HEADER_FILE_NAME.equals(fileItem.getName())); } diff --git a/src/main/java/im/zhaojun/common/model/constant/ZFileConstant.java b/src/main/java/im/zhaojun/common/model/constant/ZFileConstant.java index 3ce1553..13fc0c0 100644 --- a/src/main/java/im/zhaojun/common/model/constant/ZFileConstant.java +++ b/src/main/java/im/zhaojun/common/model/constant/ZFileConstant.java @@ -19,11 +19,6 @@ public class ZFileConstant { */ public static String HEADER_FILE_NAME = "header.md"; - /** - * 页面尾部文件 - */ - public static String FOOTER_FILE_NAME = "footer.md"; - /** * 密码文件 */ @@ -34,11 +29,6 @@ public class ZFileConstant { ZFileConstant.HEADER_FILE_NAME = headerFileName; } - @Autowired(required = false) - public void setFooterFileName(@Value("${zfile.constant.footer}") String footerFileName) { - ZFileConstant.FOOTER_FILE_NAME = footerFileName; - } - @Autowired(required = false) public void setPasswordFileName(@Value("${zfile.constant.password}") String passwordFileName) { ZFileConstant.PASSWORD_FILE_NAME = passwordFileName; diff --git a/src/main/java/im/zhaojun/common/model/dto/SiteConfigDTO.java b/src/main/java/im/zhaojun/common/model/dto/SiteConfigDTO.java index 6f82f44..20e96c6 100644 --- a/src/main/java/im/zhaojun/common/model/dto/SiteConfigDTO.java +++ b/src/main/java/im/zhaojun/common/model/dto/SiteConfigDTO.java @@ -1,53 +1,23 @@ package im.zhaojun.common.model.dto; import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import lombok.ToString; import java.io.Serializable; /** * @author zhaojun */ +@Data +@ToString public class SiteConfigDTO implements Serializable { private static final long serialVersionUID = 8811196207046121740L; private String header; - private String footer; - @JsonProperty("viewConfig") private SystemConfigDTO systemConfigDTO; - public String getHeader() { - return header; - } - - public void setHeader(String header) { - this.header = header; - } - - public String getFooter() { - return footer; - } - - public void setFooter(String footer) { - this.footer = footer; - } - - public SystemConfigDTO getSystemConfigDTO() { - return systemConfigDTO; - } - - public void setSystemConfigDTO(SystemConfigDTO systemConfigDTO) { - this.systemConfigDTO = systemConfigDTO; - } - - @Override - public String toString() { - return "SiteConfigDTO{" + - "header='" + header + '\'' + - ", footer='" + footer + '\'' + - ", systemConfig=" + systemConfigDTO + - '}'; - } } diff --git a/src/main/java/im/zhaojun/common/service/SystemService.java b/src/main/java/im/zhaojun/common/service/SystemService.java index f963802..286fb7a 100644 --- a/src/main/java/im/zhaojun/common/service/SystemService.java +++ b/src/main/java/im/zhaojun/common/service/SystemService.java @@ -30,9 +30,7 @@ public class SystemService { List fileItemList = new ArrayList<>(fileService.fileList(path)); for (FileItemDTO fileItemDTO : fileItemList) { - if (ZFileConstant.FOOTER_FILE_NAME.equalsIgnoreCase(fileItemDTO.getName())) { - siteConfigDTO.setFooter(HttpUtil.getTextContent(fileItemDTO.getUrl())); - } else if (ZFileConstant.HEADER_FILE_NAME.equalsIgnoreCase(fileItemDTO.getName())) { + if (ZFileConstant.HEADER_FILE_NAME.equalsIgnoreCase(fileItemDTO.getName())) { siteConfigDTO.setHeader(HttpUtil.getTextContent(fileItemDTO.getUrl())); } } diff --git a/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 1dd96cb..e496c2f 100644 --- a/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -11,12 +11,6 @@ "defaultValue": "header.md", "description": "头部文件 文件名." }, - { - "name": "zfile.constant.footer", - "type": "java.lang.String", - "defaultValue": "footer.md", - "description": "尾部文件 文件名." - }, { "name": "zfile.constant.password", "type": "java.lang.String", diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 75d7f38..eec6f22 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -45,7 +45,6 @@ zfile: timeout: 300 constant: header: header.md - footer: footer.md password: password.txt onedirve: clientId: 09939809-c617-43c8-a220-a93c1513c5d4