renun/zfile
1
0
Fork 0
mirror of https://github.com/zfile-dev/zfile.git synced 2025-04-19 05:34:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ 新增功能: 自定义表格大小, 显示操作按钮, 显示文档, 公告信息

Browse Source
This commit is contained in:
zhaojun1998
2020-02-15 18:22:37 +08:00
parent 610f68295f
commit 2f57c5b5cc
12 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/im/zhaojun/common/controller/FileController.java
View File

@@ -74,7 +74,7 @@ public class FileController {
/**
* 获取系统配置信息和当前页的标题, 文件头, 文件尾信息
* 获取系统配置信息和当前页的标题, 页面文档信息
* @param path 路径
*/
@CheckStorageStrategyInit
@@ -107,7 +107,7 @@ public class FileController {
/**
* 过滤文件列表, 不显示密码, 头部和尾部文件.
* 过滤文件列表, 不显示密码, 文档文件.
*/
private void filterFileList(List<FileItemDTO> fileItemList) {
if (fileItemList == null) {
@@ -115,7 +115,7 @@ public class FileController {
}
fileItemList.removeIf(fileItem -> ZFileConstant.PASSWORD_FILE_NAME.equals(fileItem.getName())
|| ZFileConstant.HEADER_FILE_NAME.equals(fileItem.getName()));
|| ZFileConstant.README_FILE_NAME.equals(fileItem.getName()));
}

8
src/main/java/im/zhaojun/common/model/constant/ZFileConstant.java
View File

@@ -15,9 +15,9 @@ public class ZFileConstant {
public static final String AUDIO_TMP_PATH = "/.zfile/tmp/audio/";
/**
* 页面头部文件
* 页面文档文件
*/
public static String HEADER_FILE_NAME = "header.md";
public static String README_FILE_NAME = "readme.md";
/**
* 密码文件
@@ -25,8 +25,8 @@ public class ZFileConstant {
public static String PASSWORD_FILE_NAME = "password.txt";
@Autowired(required = false)
public void setHeaderFileName(@Value("${zfile.constant.header}") String headerFileName) {
ZFileConstant.HEADER_FILE_NAME = headerFileName;
public void setHeaderFileName(@Value("${zfile.constant.readme}") String headerFileName) {
ZFileConstant.README_FILE_NAME = headerFileName;
}
@Autowired(required = false)

2
src/main/java/im/zhaojun/common/model/dto/SiteConfigDTO.java
View File

@@ -15,7 +15,7 @@ public class SiteConfigDTO implements Serializable {
private static final long serialVersionUID = 8811196207046121740L;
private String header;
private String readme;
@JsonProperty("viewConfig")
private SystemConfigDTO systemConfigDTO;

11
src/main/java/im/zhaojun/common/model/dto/SystemConfigDTO.java
View File

@@ -44,4 +44,15 @@ public class SystemConfigDTO {
private String customCss;
private String tableSize;
private Boolean showOperator;
private Boolean showDocument;
private String announcement;
private Boolean showAnnouncement;
private String layout;
}

6
src/main/java/im/zhaojun/common/service/SystemService.java
View File

@@ -20,7 +20,7 @@ public class SystemService {
private SystemConfigService systemConfigService;
/**
* 构建指定路径下标题, 页头, 页尾
* 构建指定路径下标题, 页面文档信息
* @param path 路径
*/
public synchronized SiteConfigDTO getConfig(String path) throws Exception {
@@ -30,8 +30,8 @@ public class SystemService {
List<FileItemDTO> fileItemList = new ArrayList<>(fileService.fileList(path));
for (FileItemDTO fileItemDTO : fileItemList) {
if (ZFileConstant.HEADER_FILE_NAME.equalsIgnoreCase(fileItemDTO.getName())) {
siteConfigDTO.setHeader(HttpUtil.getTextContent(fileItemDTO.getUrl()));
if (ZFileConstant.README_FILE_NAME.equalsIgnoreCase(fileItemDTO.getName())) {
siteConfigDTO.setReadme(HttpUtil.getTextContent(fileItemDTO.getUrl()));
}
}
return siteConfigDTO;

2
src/main/java/im/zhaojun/common/util/NaturalOrderComparator.java
View File

@@ -23,7 +23,7 @@ package im.zhaojun.common.util;
3. This notice may not be removed or altered from any source distribution.
*/
import java.util.*;
import java.util.Comparator;
public class NaturalOrderComparator implements Comparator<String> {

1
src/main/java/im/zhaojun/local/controller/LocalController.java
View File

@@ -1,7 +1,6 @@
package im.zhaojun.local.controller;
import cn.hutool.core.util.URLUtil;
import im.zhaojun.common.exception.NotExistFileException;
import im.zhaojun.common.util.StringUtils;
import im.zhaojun.local.service.LocalServiceImpl;
import org.springframework.core.io.FileSystemResource;

6
src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -6,10 +6,10 @@
"description": "目录缓存过期时间 和 下载地址过期时间. 单位为秒."
},
{
"name": "zfile.constant.header",
"name": "zfile.constant.readme",
"type": "java.lang.String",
"defaultValue": "header.md",
"description": "头部文件 文件名."
"defaultValue": "readme.md",
"description": "文档文件 文件名."
},
{
"name": "zfile.constant.password",

2
src/main/resources/application.yml
View File

@@ -50,7 +50,7 @@ zfile:
cache:
timeout: 300
constant:
header: header.md
readme: readme.md
password: password.txt
onedirve:
clientId: 09939809-c617-43c8-a220-a93c1513c5d4

6
src/main/resources/db/data.sql
View File

@@ -10,6 +10,12 @@ INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (9, 'enableCache', '是
INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (10, 'searchContainEncryptedFile', '搜索包含加密文件');
INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (11, 'customCss', '自定义 CSS');
INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (12, 'customJs', '自定义 JS (可用于统计代码)');
INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (13, 'tableSize', '表格大小');
INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (14, 'showOperator', '是否显示操作按钮');
INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (15, 'showDocument', '是否显示文档');
INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (16, 'announcement', '网站公告');
INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (17, 'showAnnouncement', '是否显示网站公告');
INSERT INTO SYSTEM_CONFIG (`ID`, `k`, `REMARK`) VALUES (18, 'layout', '页面布局');
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (1, 'bucket-name', '云存储服务名称', 'upyun');
INSERT INTO STORAGE_CONFIG (`ID`, `k`, `TITLE`, `TYPE`) VALUES (2, 'username', '操作员名称', 'upyun');