lsm/file-online-preview
1
0
Fork 0
mirror of https://gitee.com/kekingcn/file-online-preview.git synced 2025-10-15 18:55:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复：需求https://gitee.com/kekingcn/file-online-preview/issues/I14D4X,当使用nginx做代理时，配置了content-path和baseUrl时，访问view.html和getCorsFile会出现404

Browse Source
This commit is contained in:
telami
2020-04-27 21:36:56 +08:00
committed by kl
parent e0b1cd76ca
commit 15bd035304
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jodconverter-web/src/main/resources/static/pdfjs/web/viewer.js
View File

@@ -1886,7 +1886,7 @@ var PDFViewerApplication = {
var validateFileURL = void 0; var validateFileURL = void 0;
{ {
var HOSTED_VIEWER_ORIGINS = ['null', 'http://mozilla.github.io', 'https://mozilla.github.io']; var HOSTED_VIEWER_ORIGINS = ['null', 'http://mozilla.github.io', 'https://mozilla.github.io'];
validateFileURL = function validateFileURL(file) { validateFileURL = function validateFileURL(file,base) {
if (file === undefined) { if (file === undefined) {
return file; return file;
} }
@@ -1897,7 +1897,7 @@ var validateFileURL = void 0;
} }
var fileOrigin = new URL(file, window.location.href).origin; var fileOrigin = new URL(file, window.location.href).origin;
if (fileOrigin !== viewerOrigin) { if (fileOrigin !== viewerOrigin) {
return '/getCorsFile?urlPath=' + encodeURIComponent(file); return base.endsWith('/') ? base : '/' + 'getCorsFile?urlPath=' + encodeURIComponent(file);
} }
} catch (ex) { } catch (ex) {
var message = ex && ex.message; var message = ex && ex.message;
@@ -1931,10 +1931,12 @@ function loadAndEnablePDFBug(enabledTabs) {
function webViewerInitialized() { function webViewerInitialized() {
var appConfig = PDFViewerApplication.appConfig; var appConfig = PDFViewerApplication.appConfig;
var file = void 0; var file = void 0;
var base = void 0;
var queryString = document.location.search.substring(1); var queryString = document.location.search.substring(1);
var params = (0, _ui_utils.parseQueryString)(queryString); var params = (0, _ui_utils.parseQueryString)(queryString);
file = 'file' in params ? params.file : appConfig.defaultUrl; file = 'file' in params ? params.file : appConfig.defaultUrl;
file = validateFileURL(file); base = 'base' in params ? params.base : appConfig.defaultUrl;
file = validateFileURL(file,base);
var waitForBeforeOpening = []; var waitForBeforeOpening = [];
var fileInput = document.createElement('input'); var fileInput = document.createElement('input');
fileInput.id = appConfig.openFileInputName; fileInput.id = appConfig.openFileInputName;

2
jodconverter-web/src/main/resources/web/pdf.ftl
View File

@@ -28,7 +28,7 @@
</body> </body>
<script type="text/javascript"> <script type="text/javascript">
document.getElementsByTagName('iframe')[0].src = "/pdfjs/web/viewer.html?file="+encodeURIComponent('${finalUrl}'); document.getElementsByTagName('iframe')[0].src = "${baseUrl}pdfjs/web/viewer.html?base=${baseUrl}&file="+encodeURIComponent('${finalUrl}');
document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight-10; document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight-10;
/** /**
* 页面变化调整高度 * 页面变化调整高度