diff --git a/server/pom.xml b/server/pom.xml
index 0baafae82..b1679048d 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -91,17 +91,33 @@
poi
org.apache.poi
+
+ org.apache.poi
+ ooxml-schemas
+
fr.opensagres.xdocreport
org.apache.poi.xwpf.converter.xhtml
${xdocreport.version}
+
+
+ org.apache.poi
+ ooxml-schemas
+
+
fr.opensagres.xdocreport
fr.opensagres.xdocreport.document
${xdocreport.version}
+
+
+ org.apache.poi
+ ooxml-schemas
+
+
com.aspose
diff --git a/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java b/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java
index 00051a444..be99cd8eb 100644
--- a/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java
@@ -75,11 +75,11 @@ public String filePreviewHandle(String url, Model model, FileAttribute fileAttri
if (!officePreviewType.equalsIgnoreCase("html")) {
if (ConfigConstants.getOfficeTypeWeb().equalsIgnoreCase("web")) {
if (suffix.equalsIgnoreCase("xlsx")) {
- model.addAttribute("pdfUrl", KkFileUtils.htmlEscape(url)); //特殊符号处理
+ model.addAttribute("pdfUrl", url); //模板使用 ?js_string 按 JavaScript 字符串上下文转义
return XLSX_FILE_PREVIEW_PAGE;
}
if (suffix.equalsIgnoreCase("csv")) {
- model.addAttribute("csvUrl", KkFileUtils.htmlEscape(url));
+ model.addAttribute("csvUrl", url);
return CSV_FILE_PREVIEW_PAGE;
}
}
diff --git a/server/src/main/resources/web/bpmn.ftl b/server/src/main/resources/web/bpmn.ftl
index 756562a1b..1b2c523d3 100644
--- a/server/src/main/resources/web/bpmn.ftl
+++ b/server/src/main/resources/web/bpmn.ftl
@@ -41,7 +41,7 @@
const viewer = new BpmnJS({
container: '#diagram'
});
- var url = '${finalUrl}';
+ var url = '${finalUrl?js_string}';
var kkagent = '${kkagent}';
var baseUrl = '${baseUrl}'.endsWith('/') ? '${baseUrl}' : '${baseUrl}' + '/';
if (kkagent === 'true' || !url.startsWith(baseUrl)) {
diff --git a/server/src/main/resources/web/csv.ftl b/server/src/main/resources/web/csv.ftl
index 47f7bbbec..549dc0fd0 100644
--- a/server/src/main/resources/web/csv.ftl
+++ b/server/src/main/resources/web/csv.ftl
@@ -35,7 +35,7 @@ var process_wb = (function() {
if(typeof console !== 'undefined') console.log("output", new Date());
};
})();
- var url = '${finalUrl}';
+ var url = '${finalUrl?js_string}';
var kkagent = '${kkagent}';
var baseUrl = '${baseUrl}'.endsWith('/') ? '${baseUrl}' : '${baseUrl}' + '/';
if (kkagent === 'true' || !url.startsWith(baseUrl)) {
diff --git a/server/src/main/resources/web/dcm.ftl b/server/src/main/resources/web/dcm.ftl
index 80492b226..ef3917089 100644
--- a/server/src/main/resources/web/dcm.ftl
+++ b/server/src/main/resources/web/dcm.ftl
@@ -54,7 +54,7 @@