From 3dcd183171e192a4821b4c310a8ec0e49f74b9b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Tue, 13 Dec 2022 17:50:28 +0800
Subject: [PATCH] =?UTF-8?q?ofd=E5=92=8Ctiff=E4=B8=8B=E8=BD=BD=E8=B7=A8?=
 =?UTF-8?q?=E5=9F=9F=E6=96=87=E4=BB=B6=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/main/resources/web/ofd.ftl  |  2 +-
 server/src/main/resources/web/tiff.ftl | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/server/src/main/resources/web/ofd.ftl b/server/src/main/resources/web/ofd.ftl
index 69b25236..df6fbde4 100644
--- a/server/src/main/resources/web/ofd.ftl
+++ b/server/src/main/resources/web/ofd.ftl
@@ -15,7 +15,7 @@
     var url = '${currentUrl}';
     var baseUrl = '${baseUrl}'.endsWith('/') ? '${baseUrl}' : '${baseUrl}' + '/';
     if (!url.startsWith(baseUrl)) {
-        url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(url);
+        url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(Base64.encode(url));
     }
     document.getElementsByTagName('iframe')[0].src = "${baseUrl}ofd/index.html?file="+ encodeURIComponent(url)+"";
     document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight - 10;
diff --git a/server/src/main/resources/web/tiff.ftl b/server/src/main/resources/web/tiff.ftl
index 823b047c..38eb5ae1 100644
--- a/server/src/main/resources/web/tiff.ftl
+++ b/server/src/main/resources/web/tiff.ftl
@@ -58,17 +58,6 @@
         loadOne();
     }
 
-    function doPrint() {
-        bdhtml=window.document.body.innerHTML;
-        sprnstr="<!--startprint-->";
-        eprnstr="<!--endprint-->";
-        prnhtml=bdhtml.substr(bdhtml.indexOf(sprnstr)+17);
-        prnhtml=prnhtml.substring(0,prnhtml.indexOf(eprnstr));
-        window.document.body.innerHTML=prnhtml;
-        initWaterMark();
-        window.print();
-    }
-
     String.prototype.startsWithh = function(str) {
         var reg = new RegExp("^" + str);
         return reg.test(this);
@@ -82,7 +71,7 @@
     var url = '${finalUrl}';
     var baseUrl = '${baseUrl}'.endsWithh('/') ? '${baseUrl}' : '${baseUrl}' + '/';
     if (!url.startsWithh(baseUrl)) {
-        url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(url);
+        url = baseUrl + 'getCorsFile?urlPath=' + encodeURIComponent(Base64.encode(url));
     }
     const xhr = new XMLHttpRequest();
     xhr.open('GET', url);