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

⚡ 优化 URL 编码解码

Browse Source
This commit is contained in:
zhaojun1998
2019-08-21 16:25:18 +08:00
parent 61ad4b52c5
commit 33fd0f8046
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/im/zhaojun/aliyun/service/AliyunService.java
View File

@@ -96,7 +96,6 @@ public class AliyunService implements FileService {
@Override
public String getDownloadUrl(String path) throws Exception {
path = StringUtils.removeFirstSeparator(path);
path = URLDecoder.decode(path, "utf8");
if (isPrivate) {
Date expirationDate = new Date(new Date().getTime() + timeout * 1000);

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

@@ -5,23 +5,15 @@ import im.zhaojun.common.config.StorageTypeFactory;
import im.zhaojun.common.enums.FileTypeEnum;
import im.zhaojun.common.enums.StorageTypeEnum;
import im.zhaojun.common.model.FileItem;
import im.zhaojun.common.model.ImageInfo;
import im.zhaojun.common.model.ResultBean;
import im.zhaojun.common.model.SiteConfig;
import im.zhaojun.common.service.FileService;
import im.zhaojun.common.service.SystemConfigService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.List;
@@ -35,7 +27,7 @@ public class FileController {
@GetMapping("/filelist")
public ResultBean list(String path, String sortBy, boolean descending) throws Exception {
List<FileItem> fileItems = fileService.fileList(path);
List<FileItem> fileItems = fileService.fileList(URLUtil.decode(path));
// 排序, 先按照文件类型比较, 文件夹在前, 文件在后, 然后根据 sortBy 字段排序, 默认为升序;
fileItems.sort((o1, o2) -> {
@@ -72,7 +64,7 @@ public class FileController {
*/
@GetMapping("/downloadUrl")
public ResultBean getDownloadUrl(String path) throws Exception {
return ResultBean.successData(fileService.getDownloadUrl(path));
return ResultBean.successData(fileService.getDownloadUrl(URLUtil.decode(path)));
}
/**

1
src/main/java/im/zhaojun/huawei/service/HuaweiService.java
View File

@@ -96,7 +96,6 @@ public class HuaweiService implements FileService {
@Override
public String getDownloadUrl(String path) throws Exception {
path = StringUtils.removeFirstSeparator(path);
path = URLDecoder.decode(path, "utf8");
TemporarySignatureRequest req = new TemporarySignatureRequest(HttpMethodEnum.GET, timeout);
req.setBucketName(bucketName);
req.setObjectKey(path);