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

Merge branch release/v8.1.0 into develop

Browse Source
This commit is contained in:
papacarlo
2024-06-26 10:47:56 +00:00
parent 9787325c54 d4ac980ff2
commit 8df5236cf7
10 changed files with 131 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DocService/sources/converterservice.js
View File

@ -261,8 +261,7 @@ function convertRequest(req, res, isJson) {
}
let filetype = params.filetype || params.fileType || '';
let outputtype = params.outputtype || params.outputType || '';
let docId = 'conv_' + params.key + '_' + outputtype;
ctx.setDocId(docId);
ctx.setDocId(params.key);
if (params.key && !constants.DOC_ID_REGEX.test(params.key)) {
ctx.logger.warn('convertRequest unexpected key = %s', params.key);
@ -291,6 +290,8 @@ function convertRequest(req, res, isJson) {
outputFormat = constants.AVS_OFFICESTUDIO_FILE_DOCUMENT_OFORM_PDF;
}
}
//todo use hash of params as id
let docId = 'conv_' + params.key + '_' + outputFormat;
var cmd = new commonDefines.InputCommand();
cmd.setCommand('conv');
cmd.setUrl(params.url);