IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Thumb: fix

Browse Source
This commit is contained in:
pavelbannov 2020-06-17 14:36:09 +03:00
parent 103de233e9
commit f4592ed73d
10 changed files with 1532 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/ASC.Thumbnails/app/log.js
View File

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2018 * (c) Copyright Ascensio System Limited 2010-2020
* *
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
@ -53,6 +53,6 @@ const transports = [
fileTransport fileTransport
]; ];
winston.handleExceptions(fileTransport); winston.exceptions.handle(fileTransport);
module.exports = new winston.Logger({ transports: transports, exitOnError: false}); module.exports = winston.createLogger({ transports: transports, exitOnError: false});

2
common/ASC.Thumbnails/app/thumb.js
View File

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2018 * (c) Copyright Ascensio System Limited 2010-2020
* *
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).

26
common/ASC.Thumbnails/app/webshot/options.js
View File

@ -1,3 +1,29 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2020
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
// Options for the phantom script // Options for the phantom script
exports.phantom = { exports.phantom = {
windowSize: { windowSize: {

26
common/ASC.Thumbnails/app/webshot/webshot.js
View File

@ -1,3 +1,29 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2020
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
var url = require('url') var url = require('url')
, fs = require('graceful-fs') , fs = require('graceful-fs')
, tmp = require('tmp') , tmp = require('tmp')

26
common/ASC.Thumbnails/app/webshot/webshot.phantom.js
View File

@ -1,3 +1,29 @@
/*
*
* (c) Copyright Ascensio System Limited 2010-2020
*
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).
* In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that
* Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
*
* THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
* FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
*
* You can contact Ascensio System SIA by email at sales@onlyoffice.com
*
* The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display
* Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
*
* Pursuant to Section 7 § 3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains
* relevant author attributions when distributing the software. If the display of the logo in its graphic
* form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE"
* in every copy of the program you distribute.
* Pursuant to Section 7 § 3(e) we decline to grant you any rights under trademark law for use of our trademarks.
*
*/
var system = require('system') var system = require('system')
, page = require('webpage').create() , page = require('webpage').create()
, fs = require('fs') , fs = require('fs')

2
common/ASC.Thumbnails/config/index.js
View File

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2018 * (c) Copyright Ascensio System Limited 2010-2020
* *
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).

2
common/ASC.Thumbnails/index.js
View File

@ -1,6 +1,6 @@
/* /*
* *
* (c) Copyright Ascensio System Limited 2010-2018 * (c) Copyright Ascensio System Limited 2010-2020
* *
* This program is freeware. You can redistribute it and/or modify it under the terms of the GNU * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU
* General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html).

28
common/ASC.Thumbnails/package.json
View File

@ -3,21 +3,25 @@
"version": "1.0.0", "version": "1.0.0",
"description": "A service which takes a screenshot of a page saves it and returns a link.", "description": "A service which takes a screenshot of a page saves it and returns a link.",
"main": "index.js", "main": "index.js",
"private": true,
"author": {
"name": "Ascensio System SIA"
},
"dependencies": { "dependencies": {
"co": "^4.6.0", "co": "^4.6.0",
"cookie-parser": "~1.4.3", "cookie-parser": "~1.4.5",
"express": "^4.16.3", "express": "^4.17.1",
"filenamify-url": "^1.0.0", "filenamify-url": "^2.1.1",
"moment": "^2.22.1", "moment": "^2.26.0",
"nconf": "^0.10.0", "nconf": "^0.10.0",
"node-cache": "^4.2.0", "node-cache": "^5.1.0",
"request": "^2.87.0", "request": "^2.88.2",
"winston": "^2.4.1", "winston": "^3.2.1",
"winston-daily-rotate-file": "^3.2.0", "winston-daily-rotate-file": "^4.4.2",
"graceful-fs": "~3.0.4", "graceful-fs": "~4.2.4",
"cross-spawn": "^0.2.3", "cross-spawn": "^7.0.3",
"tmp": "~0.0.25", "tmp": "~0.2.1",
"phantomjs-prebuilt": "^2.1.3" "phantomjs-prebuilt": "^2.1.16"
}, },
"devDependencies": {}, "devDependencies": {},
"scripts": { "scripts": {

1417
common/ASC.Thumbnails/yarn.lock Normal file
View File

File diff suppressed because it is too large Load Diff

22
common/services/ASC.Thumbnails.Svc/Properties/launchSettings.json
View File

@ -3,25 +3,33 @@
"windowsAuthentication": false, "windowsAuthentication": false,
"anonymousAuthentication": true, "anonymousAuthentication": true,
"iisExpress": { "iisExpress": {
"applicationUrl": "http://localhost:55420/", "applicationUrl": "http://localhost:5016/",
"sslPort": 44311 "sslPort": 0
} }
}, },
"profiles": { "profiles": {
"IIS Express": { "IIS Express": {
"commandName": "IISExpress", "commandName": "IISExpress",
"launchBrowser": true, "launchBrowser": false,
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../Data",
"log__name": "urlshortener",
"log__dir": "../../../Logs",
"core__products__folder": "../../../products"
} }
}, },
"ASC.Thumbnails.Svc": { "ASC.Thumbnails.Svc": {
"commandName": "Project", "commandName": "Project",
"launchBrowser": true, "launchBrowser": false,
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development",
"$STORAGE_ROOT": "../../../Data",
"log__name": "urlshortener",
"log__dir": "../../../Logs",
"core__products__folder": "../../../products"
}, },
"applicationUrl": "https://localhost:5001;http://localhost:5000" "applicationUrl": "http://localhost:5016/"
} }
} }
} }