diff --git a/public/index.html b/public/index.html index d25edba..8db59a9 100644 --- a/public/index.html +++ b/public/index.html @@ -7,37 +7,12 @@ - - - - - 蓝眼云盘 + EyeblueTank - +
- diff --git a/public/logo192.png b/public/logo192.png deleted file mode 100644 index fc44b0a..0000000 Binary files a/public/logo192.png and /dev/null differ diff --git a/public/logo512.png b/public/logo512.png deleted file mode 100644 index a4e47a6..0000000 Binary files a/public/logo512.png and /dev/null differ diff --git a/public/manifest.json b/public/manifest.json deleted file mode 100644 index 080d6c7..0000000 --- a/public/manifest.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "short_name": "React App", - "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" - } - ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" -} diff --git a/public/robots.txt b/public/robots.txt deleted file mode 100644 index e9e57dc..0000000 --- a/public/robots.txt +++ /dev/null @@ -1,3 +0,0 @@ -# https://www.robotstxt.org/robotstxt.html -User-agent: * -Disallow: diff --git a/src/common/model/preference/model/PreviewEngine.ts b/src/common/model/preference/model/PreviewEngine.ts index c897409..82a6cc3 100644 --- a/src/common/model/preference/model/PreviewEngine.ts +++ b/src/common/model/preference/model/PreviewEngine.ts @@ -11,11 +11,7 @@ export default class PreviewEngine extends Base { /** * 此预览引擎的url * {originUrl} 文件原始的url地址。eg: https://tank.eyeblue.cn/api/alien/download/2a0ceee1-744c-4c82-4215-69c382597a50/abstract-free-photo-2210x1473.jpg - * {publicUrl} 对于公有文件publicUrl=originUrl，对于私有文件publicUrl是originUrl带上downloadToken。 eg: https://tank.eyeblue.cn/api/alien/download/2a0ceee1-744c-4c82-4215-69c382597a50/abstract-free-photo-2210x1473.jpg?downloadTokenUuid=6bdba52f-af6b-49ae-5a5d-fd80bfb01d3b - * {encodeOriginUrl} 被encodeURIComponent处理后的originUrl。 - * {encodePublicUrl} 被encodeURIComponent处理后的publicUrl。 - * - * {url} 等价于encodePublicUrl，只提供给用户就行了。 + * {url} 对于公有文件publicUrl=originUrl，对于私有文件publicUrl是originUrl带上downloadToken。 eg: https://tank.eyeblue.cn/api/alien/download/2a0ceee1-744c-4c82-4215-69c382597a50/abstract-free-photo-2210x1473.jpg?downloadTokenUuid=6bdba52f-af6b-49ae-5a5d-fd80bfb01d3b */ url: string = "" @@ -51,7 +47,7 @@ export default class PreviewEngine extends Base { //添加office默认预览引擎，使用微软开放接口 let officeEngine: PreviewEngine = new PreviewEngine() - officeEngine.url = "https://view.officeapps.live.com/op/embed.aspx?src={encodeUrl}" + officeEngine.url = "https://view.officeapps.live.com/op/embed.aspx?src={url}" officeEngine.extensions = "doc,ppt,xls,docx,pptx,xlsx" officeEngine.previewInSite = true defaultEngines.push(officeEngine) diff --git a/src/pages/widget/previewer/PreviewerHelper.ts b/src/pages/widget/previewer/PreviewerHelper.ts index cf46033..a3fa9c6 100644 --- a/src/pages/widget/previewer/PreviewerHelper.ts +++ b/src/pages/widget/previewer/PreviewerHelper.ts @@ -84,10 +84,8 @@ export default class PreviewerHelper { PreviewerHelper.prepareMatterUrl(matter, needToken, function (url) { - targetUrl = targetUrl.replace("{originUrl}", url); - targetUrl = targetUrl.replace("{publicUrl}", url); - targetUrl = targetUrl.replace("{encodeOriginUrl}", encodeURIComponent(url)); - targetUrl = targetUrl.replace("{encodePublicUrl}", encodeURIComponent(url)); + targetUrl = targetUrl.replace("{originUrl}", matter.getPreviewUrl()); + targetUrl = targetUrl.replace("{url}", encodeURIComponent(url)); if (engine.previewInSite) { BrowserPreviewer.show(fileName, targetUrl, matter.size)