From 5ec53c4b3301e2abbd347e42593444f32bfc9493 Mon Sep 17 00:00:00 2001 From: kl Date: Tue, 29 Dec 2020 18:32:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E5=AE=9ABase64=E8=BD=AC=E7=A0=81?= =?UTF-8?q?=E9=87=87=E7=94=A8Apache=20Commons-code=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=EF=BC=8C=E4=BF=AE=E5=A4=8Dbase64=E9=83=A8?= =?UTF-8?q?=E5=88=86jdk=E7=89=88=E6=9C=AC=E4=B8=8B=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/keking/service/impl/SimTextFilePreviewImpl.java | 5 ++--- .../cn/keking/web/controller/OnlinePreviewController.java | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java index 19fa8dec4..95156e85b 100644 --- a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java +++ b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java @@ -5,14 +5,13 @@ import cn.keking.service.FilePreview; import cn.keking.utils.DownloadUtils; import cn.keking.utils.KkFileUtils; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.springframework.stereotype.Service; import org.springframework.ui.Model; -import org.springframework.util.Base64Utils; import java.io.File; import java.io.IOException; -import java.nio.charset.StandardCharsets; /** * Created by kl on 2018/1/17. @@ -38,7 +37,7 @@ public String filePreviewHandle(String url, Model model, FileAttribute fileAttri File originFile = new File(response.getContent()); String charset = KkFileUtils.getFileEncode(originFile); String fileData = FileUtils.readFileToString(originFile, charset); - model.addAttribute("textData", Base64Utils.encodeToString(fileData.getBytes(StandardCharsets.UTF_8))); + model.addAttribute("textData", Base64.encodeBase64String(fileData.getBytes())); } catch (IOException e) { return otherFilePreview.notSupportedFile(model, fileAttribute, e.getLocalizedMessage()); } diff --git a/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java b/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java index 0a9d09106..c11cc406f 100644 --- a/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java +++ b/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java @@ -9,12 +9,12 @@ import cn.keking.service.FileHandlerService; import cn.keking.utils.WebUtils; import io.mola.galimatias.GalimatiasParseException; +import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; -import org.springframework.util.Base64Utils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -54,7 +54,7 @@ public OnlinePreviewController(FilePreviewFactory filePreviewFactory, FileHandle public String onlinePreview(String url, Model model, HttpServletRequest req) { String fileUrl; try { - fileUrl = new String(Base64Utils.decodeFromString(url)); + fileUrl = new String(Base64.decodeBase64(url)); } catch (Exception ex) { String errorMsg = String.format(BASE64_DECODE_ERROR_MSG, "url"); return otherFilePreview.notSupportedFile(model, errorMsg); @@ -70,7 +70,7 @@ public String onlinePreview(String url, Model model, HttpServletRequest req) { public String picturesPreview(String urls, Model model, HttpServletRequest req) throws UnsupportedEncodingException { String fileUrls; try { - fileUrls = new String(Base64Utils.decodeFromString(urls)); + fileUrls = new String(Base64.decodeBase64(urls)); } catch (Exception ex) { String errorMsg = String.format(BASE64_DECODE_ERROR_MSG, "urls"); return otherFilePreview.notSupportedFile(model, errorMsg); @@ -83,7 +83,7 @@ public String picturesPreview(String urls, Model model, HttpServletRequest req) String currentUrl = req.getParameter("currentUrl"); if (StringUtils.hasText(currentUrl)) { - String decodedCurrentUrl = new String(Base64Utils.decodeFromString(currentUrl)); + String decodedCurrentUrl = new String(Base64.decodeBase64(currentUrl)); model.addAttribute("currentUrl", decodedCurrentUrl); } else { model.addAttribute("currentUrl", imgUrls.get(0));