pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/forcesave

Browse Source 
# Conflicts:
#	web/documentserver-example/java/src/main/resources/settings.properties
This commit is contained in:
Alexandr Fedorov
2021-02-16 15:07:23 +03:00
parent 6a89a073fa fef62baa2b
commit 1a6744a814
5 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/documentserver-example/java/nb-configuration.xml
View File

@ -54,7 +54,6 @@ Any value defined here will override the pom.xml file value but is only applicab
<word>ppsx</word>
<word>ppt</word>
<word>pptx</word>
<word>ResourceService</word>
<word>rtf</word>
<word>SIA</word>
<word>teamlab</word>

9
web/documentserver-example/java/src/main/java/helpers/FileUtility.java
View File

@ -74,15 +74,8 @@ public class FileUtility
{
if (url == null) return "";
//for external file url
String tempstorage = ConfigManager.GetProperty("files.docservice.url.site") + ConfigManager.GetProperty("files.docservice.url.tempstorage");
if (!tempstorage.isEmpty() && url.startsWith(tempstorage))
{
Map<String, String> params = GetUrlParams(url);
return params == null ? null : params.get("filename");
}
String fileName = url.substring(url.lastIndexOf('/') + 1, url.length());
fileName = fileName.split("\\?")[0];
return fileName;
}

1
web/documentserver-example/java/src/main/resources/settings.properties
View File

@ -9,7 +9,6 @@ files.docservice.timeout=120000
files.docservice.url.site=https://documentserver/
files.docservice.url.converter=ConvertService.ashx
files.docservice.url.command=coauthoring/CommandService.ashx
files.docservice.url.tempstorage=ResourceService.ashx
files.docservice.url.api=web-apps/apps/api/documents/api.js
files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html
files.docservice.url.example=

1
web/documentserver-example/nodejs/config/default.json
View File

@ -15,7 +15,6 @@
"siteUrl": "https://documentserver/",
"commandUrl": "coauthoring/CommandService.ashx",
"converterUrl": "ConvertService.ashx",
"tempStorageUrl": "ResourceService.ashx",
"apiUrl": "web-apps/apps/api/documents/api.js",
"preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html",
"exampleUrl": null,

16
web/documentserver-example/nodejs/helpers/fileUtility.js
View File

@ -16,24 +16,14 @@
*
*/
var configServer = require('config').get('server');
var siteUrl = configServer.get('siteUrl');
var tempStorageUrl = siteUrl + configServer.get('tempStorageUrl');
var fileUtility = {};
fileUtility.getFileName = function (url, withoutExtension) {
if (!url) return "";
var filename;
if (tempStorageUrl && url.indexOf(tempStorageUrl) == 0) {
var params = getUrlParams(url);
filename = params == null ? null : params["filename"];
} else {
var parts = url.toLowerCase().split("/");
fileName = parts.pop();
}
var parts = url.toLowerCase().split("/");
var fileName = parts.pop();
fileName = fileName.split("?")[0];
if (withoutExtension) {
var ext = fileUtility.getFileExtension(fileName);