From d4b11a4056f70001c9fbfb65aef6febd3d8c4acb Mon Sep 17 00:00:00 2001 From: kl Date: Fri, 25 Dec 2020 21:02:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=9C=AC=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=A2=84=E8=A7=88=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/config/freemarker_implicit.ftl | 1 + .../service/impl/SimTextFilePreviewImpl.java | 19 +++++------------ .../src/main/resources/web/txt.ftl | 21 +++++++------------ 3 files changed, 13 insertions(+), 28 deletions(-) diff --git a/jodconverter-web/src/main/config/freemarker_implicit.ftl b/jodconverter-web/src/main/config/freemarker_implicit.ftl index a0442ad6..4f8e8321 100644 --- a/jodconverter-web/src/main/config/freemarker_implicit.ftl +++ b/jodconverter-web/src/main/config/freemarker_implicit.ftl @@ -1,5 +1,6 @@ [#ftl] [#-- @implicitly included --] +[#-- @ftlvariable name="textData" type="java.lang.String" --] [#-- @ftlvariable name="xmlContent" type="java.lang.String" --] [#-- @ftlvariable name="textContent" type="java.lang.String" --] [#-- @ftlvariable name="textType" type="java.lang.String" --] diff --git a/jodconverter-web/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java b/jodconverter-web/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java index 8df63d1c..b116dfed 100644 --- a/jodconverter-web/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java +++ b/jodconverter-web/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java @@ -29,32 +29,23 @@ public class SimTextFilePreviewImpl implements FilePreview { } @Override - public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute){ + public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) { String fileName = fileAttribute.getName(); ReturnResponse response = downloadUtils.downLoad(fileAttribute, fileName); if (0 != response.getCode()) { model.addAttribute("msg", response.getMsg()); - model.addAttribute("fileType",fileAttribute.getSuffix()); + model.addAttribute("fileType", fileAttribute.getSuffix()); return "fileNotSupported"; } try { File originFile = new File(response.getContent()); - File previewFile = new File(response.getContent() + ".txt"); - if (previewFile.exists()) { - previewFile.delete(); - } - Files.copy(originFile.toPath(), previewFile.toPath()); - if(fileAttribute.getType().equals(FileType.xml)){ - String xmlString = FileUtils.readFileToString(previewFile, StandardCharsets.UTF_8); - - model.addAttribute("xmlContent", Base64Utils.encodeToString(xmlString.getBytes())); - } + String xmlString = FileUtils.readFileToString(originFile, StandardCharsets.UTF_8); + model.addAttribute("textData", Base64Utils.encodeToString(xmlString.getBytes())); } catch (IOException e) { model.addAttribute("msg", e.getLocalizedMessage()); - model.addAttribute("fileType",fileAttribute.getSuffix()); + model.addAttribute("fileType", fileAttribute.getSuffix()); return "fileNotSupported"; } - model.addAttribute("ordinaryUrl", response.getMsg()); return "txt"; } diff --git a/jodconverter-web/src/main/resources/web/txt.ftl b/jodconverter-web/src/main/resources/web/txt.ftl index 0bb0579d..6c4eee88 100644 --- a/jodconverter-web/src/main/resources/web/txt.ftl +++ b/jodconverter-web/src/main/resources/web/txt.ftl @@ -7,6 +7,7 @@ +
<#if textType?? && textType == "markdown"> @@ -16,7 +17,6 @@

<#elseif textType?? && textType == "xml" > -
<#else>
@@ -42,6 +42,9 @@ $("#markdown_btn").hide() initWaterMark(); fetchData(); + loadText(); + loadXmlData() + loadMarkdown(); } /** @@ -73,17 +76,8 @@ * 获取文本数据 */ function fetchData() { - $.ajax({ - type: 'GET', - url: '${ordinaryUrl}', - success: function (data) { - window.textData = data; - window.textPreData = "
" + data + "
"; - loadText(); - loadXmlData() - loadMarkdown(); - } - }); + window.textData = Base64.decode($("#textData").val()) + window.textPreData = "
" + window.textData + "
"; } /** @@ -108,8 +102,7 @@ */ function loadXmlData() { if ($("#textType").val() === "xml") { - var xmlStr = Base64.decode($("#xmlContent").val()); - var xmlNode = xmlTreeViewer.parseXML(xmlStr); + var xmlNode = xmlTreeViewer.parseXML(window.textData); var retNode = xmlTreeViewer.getXMLViewerNode(xmlNode.xml); $("#xml").html(retNode); }