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

поправлены ссылки на script sockjs

Browse Source 
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/nodeJSProjects@67880 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Sergey.Konovalov
2016-02-02 16:13:56 +00:00
committed by Alexander.Trofimov
parent 3fad93efc3
commit 2559d39728
6 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Common/config/default.json
View File

@ -52,6 +52,7 @@
"workerpercpu": 1, "workerpercpu": 1,
"mode": "development", "mode": "development",
"fonts_route": "OfficeWeb/sdk/Fonts/", "fonts_route": "OfficeWeb/sdk/Fonts/",
"sockjsUrl": "",
"limits_tempfile_upload": 104857600, "limits_tempfile_upload": 104857600,
"limits_image_size": 26214400, "limits_image_size": 26214400,
"limits_image_download_timeout": 120, "limits_image_download_timeout": 120,

1
Common/config/development-windows.json
View File

@ -11,6 +11,7 @@
"server": { "server": {
"port": 8001, "port": 8001,
"fonts_route": "office/sdk/Fonts/", "fonts_route": "office/sdk/Fonts/",
"sockjsUrl": "/office/vendor/sockjs/sockjs.min.js",
"editor_settings_spellchecker_url": "http://localhost:8080", "editor_settings_spellchecker_url": "http://localhost:8080",
"static_content": [{ "static_content": [{
"name": "/OfficeWeb", "name": "/OfficeWeb",

3
Common/config/production-linux.json
View File

@ -14,7 +14,8 @@
"services": { "services": {
"CoAuthoring": { "CoAuthoring": {
"server": { "server": {
"default_license_file_path": "/var/www/onlyoffice/Data/" "sockjsUrl": "/OfficeWeb/vendor/sockjs/sockjs.min.js",
"default_license_file_path": "/var/www/onlyoffice/Data/"
}, },
"utils": { "utils": {
"utils_common_fontdir": "/usr/share/fonts" "utils_common_fontdir": "/usr/share/fonts"

27
Common/sources/sockjs-0.3.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
DocService/sources/DocsCoServer.js
View File

@ -82,6 +82,7 @@ var cfgExpDocuments = config.get('expire.documents');
var cfgExpDocumentsCron = config.get('expire.documentsCron'); var cfgExpDocumentsCron = config.get('expire.documentsCron');
var cfgExpFiles = config.get('expire.files'); var cfgExpFiles = config.get('expire.files');
var cfgExpFilesCron = config.get('expire.filesCron'); var cfgExpFilesCron = config.get('expire.filesCron');
var cfgSockjsUrl = config.get('server.sockjsUrl');
var redisKeyCallback = cfgRedisPrefix + 'callback:'; var redisKeyCallback = cfgRedisPrefix + 'callback:';
var redisKeyUserIndex = cfgRedisPrefix + 'userindex:'; var redisKeyUserIndex = cfgRedisPrefix + 'userindex:';
@ -714,7 +715,7 @@ exports.getCallback = getCallback;
exports.deleteCallback= deleteCallback; exports.deleteCallback= deleteCallback;
exports.install = function(server, callbackFunction) { exports.install = function(server, callbackFunction) {
'use strict'; 'use strict';
var sockjs_opts = {sockjs_url: './../../Common/sources/sockjs-0.3.min.js'}, var sockjs_opts = {sockjs_url: cfgSockjsUrl},
sockjs_echo = sockjs.createServer(sockjs_opts), sockjs_echo = sockjs.createServer(sockjs_opts),
saveTimers = {},// Таймеры сохранения, после выхода всех пользователей saveTimers = {},// Таймеры сохранения, после выхода всех пользователей
urlParse = new RegExp("^/doc/([" + constants.DOC_ID_PATTERN + "]*)/c.+", 'i'); urlParse = new RegExp("^/doc/([" + constants.DOC_ID_PATTERN + "]*)/c.+", 'i');

5
SpellChecker/sources/spellCheck.js
View File

@ -2,7 +2,8 @@
nodehun = require('nodehun'), nodehun = require('nodehun'),
config = require('config').get('SpellChecker'), config = require('config').get('SpellChecker'),
logger = require('./../../Common/sources/logger'), logger = require('./../../Common/sources/logger'),
fs = require('fs'); fs = require('fs'),
cfgSockjsUrl = require('config').get('services.CoAuthoring.server.sockjsUrl');
var arrDictionaries = {}; var arrDictionaries = {};
(function() { (function() {
@ -36,7 +37,7 @@ CheckDictionary(arrDictionaries[0x0409], 'color', 'calor');*/
exports.install = function (server, callbackFunction) { exports.install = function (server, callbackFunction) {
'use strict'; 'use strict';
var sockjs_opts = {sockjs_url: './../../Common/sources/sockjs-0.3.min.js'}, var sockjs_opts = {sockjs_url: cfgSockjsUrl},
sockjs_echo = sockjs.createServer(sockjs_opts); sockjs_echo = sockjs.createServer(sockjs_opts);
sockjs_echo.on('connection', function (conn) { sockjs_echo.on('connection', function (conn) {