From 79b9d703dcbc70a208cd25204c05ab5c6de3a185 Mon Sep 17 00:00:00 2001 From: gaoxiongzaq Date: Tue, 19 Dec 2023 14:37:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85=20=E5=8F=8D=E4=BB=A3=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E8=8E=B7=E5=8F=96=E8=B7=AF=E5=BE=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/keking/service/CompressFileReader.java | 2 +- .../java/cn/keking/service/FileHandlerService.java | 11 +++++++---- server/src/main/resources/web/compress.ftl | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/cn/keking/service/CompressFileReader.java b/server/src/main/java/cn/keking/service/CompressFileReader.java index 51f6c0ed..d0839be5 100644 --- a/server/src/main/java/cn/keking/service/CompressFileReader.java +++ b/server/src/main/java/cn/keking/service/CompressFileReader.java @@ -75,7 +75,7 @@ public class CompressFileReader { if (type.equals(FileType.PICTURE)) { imgUrls.add(baseUrl +folderName + "_/" + str[0].replace("\\", "/")); } - fileHandlerService.putImgCache(fileName, imgUrls); + fileHandlerService.putImgCache(fileName+ "_", imgUrls); } else { return null; } diff --git a/server/src/main/java/cn/keking/service/FileHandlerService.java b/server/src/main/java/cn/keking/service/FileHandlerService.java index 87acb5d1..147a229c 100644 --- a/server/src/main/java/cn/keking/service/FileHandlerService.java +++ b/server/src/main/java/cn/keking/service/FileHandlerService.java @@ -454,18 +454,21 @@ public class FileHandlerService implements InitializingBean { } if (!ObjectUtils.isEmpty(fileKey)) { //判断是否使用特定压缩包符号 try { + // http://127.0.0.1:8012/各类型文件1 - 副本.zip_/各类型文件/正常预览/PPT转的PDF.pdf?kkCompressfileKey=各类型文件1 - 副本.zip_ + // http://127.0.0.1:8012/preview/各类型文件1 - 副本.zip_/各类型文件/正常预览/PPT转的PDF.pdf?kkCompressfileKey=各类型文件1 - 副本.zip_ 获取路径就会错误 需要下面的方法 URL urll = new URL(url); - fileName = urll.getPath(); //压缩包类型文件 获取解压后的绝对地址 不在执行重复下载方法 + String _Path = urll.getPath(); //获取url路径 + String urlStrr = getSubString(_Path, fileKey); //反代情况下添加前缀,只获取有压缩包字符的路径 + fileName = fileKey + urlStrr.trim(); //拼接完整路径 attribute.setSkipDownLoad(true); } catch (MalformedURLException e) { e.printStackTrace(); } } url = WebUtils.encodeUrlFileName(url); - if(UrlEncoderUtils.hasUrlEncoded(fileName) && UrlEncoderUtils.hasUrlEncoded(suffix)){ //判断文件名是否转义 + if(UrlEncoderUtils.hasUrlEncoded(fileName)){ //判断文件名是否转义 try { - fileName = URLDecoder.decode(fileName, "UTF-8").replaceAll("\\+", "%20").replaceAll(" ", "%20"); - suffix = URLDecoder.decode(suffix, "UTF-8"); + fileName = URLDecoder.decode(fileName, uriEncoding).replaceAll("\\+", "%20"); } catch (UnsupportedEncodingException e) { e.printStackTrace(); } diff --git a/server/src/main/resources/web/compress.ftl b/server/src/main/resources/web/compress.ftl index d8b4a000..add1eb58 100644 --- a/server/src/main/resources/web/compress.ftl +++ b/server/src/main/resources/web/compress.ftl @@ -52,7 +52,7 @@ function chooseNode(event, treeId, treeNode) { if (!treeNode.isParent) { - var path = '${baseUrl}' + treeNode.id + "?kkCompressfileKey=" + '${fileName}'; + var path = '${baseUrl}' + treeNode.id + "?kkCompressfileKey=" + '${fileTree}'; location.href = "${baseUrl}onlinePreview?url=" + encodeURIComponent(Base64.encode(path)); } } From 6b802b65455bbfeb8a6c4acb9a253d23ebf8f217 Mon Sep 17 00:00:00 2001 From: gaoxiongzaq Date: Tue, 19 Dec 2023 15:55:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20=E6=A0=87=E6=B3=A8=E8=B7=AF=E5=BE=84=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/keking/service/CompressFileReader.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/cn/keking/service/CompressFileReader.java b/server/src/main/java/cn/keking/service/CompressFileReader.java index d0839be5..29b5e987 100644 --- a/server/src/main/java/cn/keking/service/CompressFileReader.java +++ b/server/src/main/java/cn/keking/service/CompressFileReader.java @@ -34,9 +34,10 @@ public class CompressFileReader { public String unRar(String filePath, String filePassword, String fileName, String fileKey) throws Exception { List imgUrls = new ArrayList<>(); String baseUrl = BaseUrlFilter.getBaseUrl(); + String packagePath = "_"; //防止文件名重复 压缩包统一生成文件添加_符号 String folderName = filePath.replace(fileDir, ""); //修复压缩包 多重目录获取路径错误 if (!ObjectUtils.isEmpty(fileKey)) { //压缩包文件 直接赋予路径 不予下载 - folderName = "_decompression"+folderName; + folderName = "_decompression"+folderName; //重新修改多重压缩包 生成文件路径 } RandomAccessFile randomAccessFile = null; IInArchive inArchive = null; @@ -57,11 +58,11 @@ public class CompressFileReader { } str[0] = str[0].replace("\\", File.separator); //Linux 下路径错误 String str1 = str[0].substring(0, str[0].lastIndexOf(File.separator)+ 1); - File file = new File(fileDir, finalFolderName + "_" + File.separator + str1); + File file = new File(fileDir, finalFolderName + packagePath + File.separator + str1); if (!file.exists()) { file.mkdirs(); } - OutputStream out = new FileOutputStream( fileDir+ finalFolderName + "_" + File.separator + str[0], true); + OutputStream out = new FileOutputStream( fileDir+ finalFolderName + packagePath + File.separator + str[0], true); IOUtils.write(data, out); out.close(); } catch (Exception e) { @@ -73,15 +74,15 @@ public class CompressFileReader { if (result == ExtractOperationResult.OK) { FileType type = FileType.typeFromUrl(str[0]); if (type.equals(FileType.PICTURE)) { - imgUrls.add(baseUrl +folderName + "_/" + str[0].replace("\\", "/")); + imgUrls.add(baseUrl +folderName + packagePath +"/" + str[0].replace("\\", "/")); } - fileHandlerService.putImgCache(fileName+ "_", imgUrls); + fileHandlerService.putImgCache(fileName+ packagePath, imgUrls); } else { return null; } } } - return folderName + "_"; + return folderName + packagePath; } catch (Exception e) { throw new Exception(e); } finally {