支持带密码文件夹.

This commit is contained in:
zhaojun1998
2019-09-08 21:05:58 +08:00
parent 0d47969b97
commit 0dd57e3889
8 changed files with 95 additions and 27 deletions

View File

@@ -0,0 +1,11 @@
package im.zhaojun.common.constant;
public class ZfileConstant {
public static final String HEADER_FILE_NAME = "header.md";
public static final String README_FILE_NAME = "readme.md";
public static final String PASSWORD_FILE_NAME = "password.txt";
}

View File

@@ -1,8 +1,8 @@
package im.zhaojun.common.controller;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.URLUtil;
import im.zhaojun.common.config.StorageTypeFactory;
import im.zhaojun.common.constant.ZfileConstant;
import im.zhaojun.common.enums.FileTypeEnum;
import im.zhaojun.common.enums.StorageTypeEnum;
import im.zhaojun.common.model.FileItem;
@@ -14,11 +14,13 @@ import im.zhaojun.common.service.SystemConfigService;
import im.zhaojun.common.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -34,9 +36,22 @@ public class FileController {
private SystemConfigService systemConfigService;
@GetMapping("/list")
public ResultBean list(String path, String sortBy, boolean descending) throws Exception {
public ResultBean list(String path, String sortBy, boolean descending, @RequestParam(required = false) String password) throws Exception {
List<FileItem> fileItems = fileService.fileList(StringUtils.removeDuplicateSeparator("/" + URLUtil.decode(path)));
for (FileItem fileItem : fileItems) {
if (ZfileConstant.PASSWORD_FILE_NAME.equals(fileItem.getName())) {
String url = StringUtils.removeDuplicateSeparator("/" + fileItem.getPath() + "/" + fileItem.getName());
if (!fileService.getTextContent(url).equals(password)) {
if (password != null && !"".equals(password)) return ResultBean.error("密码错误.");
return ResultBean.error("此文件夹需要密码.", ResultBean.REQUIRED_PASSWORD);
}
}
}
// 排序, 先按照文件类型比较, 文件夹在前, 文件在后, 然后根据 sortBy 字段排序, 默认为升序;
fileItems.sort((o1, o2) -> {
FileTypeEnum o1Type = o1.getType();
@@ -61,7 +76,6 @@ public class FileController {
if (descending) {
Collections.reverse(fileItems);
}
return ResultBean.successData(fileItems);
}

View File

@@ -6,9 +6,11 @@ public class ResultBean implements Serializable {
private static final long serialVersionUID = -8276264968757808344L;
private static final int SUCCESS = 0;
public static final int SUCCESS = 0;
private static final int FAIL = -1;
public static final int FAIL = -1;
public static final int REQUIRED_PASSWORD = -2;
private String msg = "操作成功";
@@ -53,6 +55,13 @@ public class ResultBean implements Serializable {
return resultBean;
}
public static ResultBean error(String msg, Integer code) {
ResultBean resultBean = new ResultBean();
resultBean.setCode(code);
resultBean.setMsg(msg);
return resultBean;
}
public String getMsg() {
return msg;
}

View File

@@ -1,20 +1,18 @@
package im.zhaojun.common.service;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.UUID;
import cn.hutool.core.util.URLUtil;
import cn.hutool.http.HttpUtil;
import com.mpatric.mp3agic.ID3v1;
import com.mpatric.mp3agic.ID3v2;
import com.mpatric.mp3agic.Mp3File;
import im.zhaojun.common.config.ZfileCacheConfiguration;
import im.zhaojun.common.constant.ZfileConstant;
import im.zhaojun.common.enums.FileTypeEnum;
import im.zhaojun.common.enums.StorageTypeEnum;
import im.zhaojun.common.model.AudioInfo;
import im.zhaojun.common.model.FileItem;
import im.zhaojun.common.model.ImageInfo;
import im.zhaojun.common.model.SiteConfig;
import im.zhaojun.common.util.AudioHelper;
import im.zhaojun.common.util.StringUtils;
import org.springframework.aop.framework.AopContext;
import org.springframework.cache.annotation.CacheConfig;
@@ -52,9 +50,9 @@ public interface FileService {
List<FileItem> fileItemList = fileService.fileList(path);
path = StringUtils.removeLastSeparator(path);
for (FileItem fileItem : fileItemList) {
if ("readme.md".equalsIgnoreCase(fileItem.getName())) {
if (ZfileConstant.README_FILE_NAME.equalsIgnoreCase(fileItem.getName())) {
siteConfig.setFooter(getTextContent(path + "/" + fileItem.getName()));
} else if ("header.md".equalsIgnoreCase(fileItem.getName())) {
} else if (ZfileConstant.HEADER_FILE_NAME.equalsIgnoreCase(fileItem.getName())) {
siteConfig.setHeader(getTextContent(path + "/" + fileItem.getName()));
}
}