7.2 patch
This commit is contained in:
Beeant
parent
3b9a791048
commit
a05666ba58
2 changed files with 112 additions and 1651 deletions
134
server.patch
134
server.patch
|
|
@ -1,9 +1,22 @@
|
||||||
diff --git a/Common/sources/constants.js b/Common/sources/constants.js
|
From 3c58d272005a300ad8fe575457d5ce25710833e9 Mon Sep 17 00:00:00 2001
|
||||||
index 0663ead..490582a 100644
|
From: Beeant <huangxb0512@gmail.com>
|
||||||
--- a/Common/sources/constants.js
|
Date: Sat, 24 Sep 2022 21:38:51 +0800
|
||||||
+++ b/Common/sources/constants.js
|
Subject: [PATCH] build: license
|
||||||
@@ -75,7 +75,7 @@ exports.LICENSE_RESULT = {
|
|
||||||
ExpiredLimited: 11
|
---
|
||||||
|
Common/sources/constants.js | 2 +-
|
||||||
|
Common/sources/license.js | 16 ++++++++--------
|
||||||
|
DocService/sources/server.js | 2 +-
|
||||||
|
FileConverter/sources/convertermaster.js | 1 -
|
||||||
|
Makefile | 2 +-
|
||||||
|
5 files changed, 11 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Common/sources/constants.js b/Common/sources/constants.js
|
||||||
|
index 65d4c6f..39a7e56 100644
|
||||||
|
--- a/Common/sources/constants.js
|
||||||
|
+++ b/Common/sources/constants.js
|
||||||
|
@@ -83,7 +83,7 @@ exports.LICENSE_RESULT = {
|
||||||
|
UsersViewCountOS: 15
|
||||||
};
|
};
|
||||||
|
|
||||||
-exports.LICENSE_CONNECTIONS = 20;
|
-exports.LICENSE_CONNECTIONS = 20;
|
||||||
|
|
@ -11,11 +24,11 @@ index 0663ead..490582a 100644
|
||||||
exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
|
exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
|
||||||
|
|
||||||
exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
|
exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
|
||||||
diff --git a/Common/sources/license.js b/Common/sources/license.js
|
diff --git a/Common/sources/license.js b/Common/sources/license.js
|
||||||
index c273afe..8786f62 100644
|
index fbd5ec8..203dcb0 100644
|
||||||
--- a/Common/sources/license.js
|
--- a/Common/sources/license.js
|
||||||
+++ b/Common/sources/license.js
|
+++ b/Common/sources/license.js
|
||||||
@@ -45,20 +45,20 @@ exports.readLicense = function*() {
|
@@ -45,22 +45,22 @@ exports.readLicense = function*() {
|
||||||
count: 1,
|
count: 1,
|
||||||
type: c_LR.Success,
|
type: c_LR.Success,
|
||||||
light: false,
|
light: false,
|
||||||
|
|
@ -25,10 +38,12 @@ index c273afe..8786f62 100644
|
||||||
- branding: false,
|
- branding: false,
|
||||||
+ branding: true,
|
+ branding: true,
|
||||||
connections: constants.LICENSE_CONNECTIONS,
|
connections: constants.LICENSE_CONNECTIONS,
|
||||||
|
connectionsView: constants.LICENSE_CONNECTIONS,
|
||||||
- customization: false,
|
- customization: false,
|
||||||
- usersCount: 0,
|
- usersCount: 0,
|
||||||
+ customization: true,
|
+ customization: true,
|
||||||
+ usersCount: constants.LICENSE_CONNECTIONS,
|
+ usersCount: constants.LICENSE_CONNECTIONS,
|
||||||
|
usersViewCount: 0,
|
||||||
usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
|
usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
|
||||||
- hasLicense: false,
|
- hasLicense: false,
|
||||||
- plugins: false,
|
- plugins: false,
|
||||||
|
|
@ -37,70 +52,51 @@ index c273afe..8786f62 100644
|
||||||
buildDate: oBuildDate,
|
buildDate: oBuildDate,
|
||||||
startDate: startDate,
|
startDate: startDate,
|
||||||
- endDate: null,
|
- endDate: null,
|
||||||
- customerId: ""
|
+ endDate: new Date("2099-01-01T23:59:59.000Z"),
|
||||||
+ customerId: "",
|
customerId: ""
|
||||||
+ endDate: new Date("2099-01-01T23:59:59.000Z")
|
|
||||||
}, null];
|
}, null];
|
||||||
};
|
};
|
||||||
|
|
||||||
-exports.packageType = constants.PACKAGE_TYPE_OS;
|
-exports.packageType = constants.PACKAGE_TYPE_OS;
|
||||||
+exports.packageType = constants.PACKAGE_TYPE_I;
|
+exports.packageType = constants.PACKAGE_TYPE_I;
|
||||||
diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
|
diff --git a/DocService/sources/server.js b/DocService/sources/server.js
|
||||||
index b654c9c..31bdf2d 100644
|
index cf3ba90..d256724 100644
|
||||||
--- a/DocService/sources/DocsCoServer.js
|
--- a/DocService/sources/server.js
|
||||||
+++ b/DocService/sources/DocsCoServer.js
|
+++ b/DocService/sources/server.js
|
||||||
@@ -165,7 +165,7 @@ let connections = []; // Активные соединения
|
@@ -110,7 +110,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
|
||||||
let lockDocumentsTimerId = {};//to drop connection that can't unlockDocument
|
|
||||||
let pubsub;
|
|
||||||
let queue;
|
|
||||||
-let licenseInfo = {type: constants.LICENSE_RESULT.Error, light: false, branding: false, customization: false, plugins: false};
|
|
||||||
+let licenseInfo = license.readLicense().next().value[0];
|
|
||||||
let licenseOriginal = null;
|
|
||||||
let shutdownFlag = false;
|
|
||||||
let expDocumentsStep = gc.getCronStep(cfgExpDocumentsCron);
|
|
||||||
@@ -3328,7 +3328,7 @@ exports.install = function(server, callbackFunction) {
|
|
||||||
});
|
|
||||||
};
|
|
||||||
exports.setLicenseInfo = function(data, original ) {
|
|
||||||
- licenseInfo = data;
|
|
||||||
+ logger.debug('Not updating license info', data);
|
|
||||||
licenseOriginal = original;
|
|
||||||
};
|
|
||||||
exports.getLicenseInfo = function() {
|
|
||||||
diff --git a/DocService/sources/server.js b/DocService/sources/server.js
|
|
||||||
index ccc232b..7c4e80d 100644
|
|
||||||
--- a/DocService/sources/server.js
|
|
||||||
+++ b/DocService/sources/server.js
|
|
||||||
@@ -147,7 +147,6 @@ try {
|
|
||||||
} catch (e) {
|
|
||||||
logger.warn('Failed to subscribe to plugin folder updates. When changing the list of plugins, you must restart the server. https://nodejs.org/docs/latest/api/fs.html#fs_availability');
|
|
||||||
}
|
|
||||||
-fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
|
|
||||||
setInterval(updateLicense, 86400000);
|
|
||||||
|
|
||||||
// Если захочется использовать 'development' и 'production',
|
|
||||||
diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
|
|
||||||
index 2c4526f..ec07464 100644
|
|
||||||
--- a/FileConverter/sources/convertermaster.js
|
|
||||||
+++ b/FileConverter/sources/convertermaster.js
|
|
||||||
@@ -85,7 +85,6 @@ if (cluster.isMaster) {
|
|
||||||
|
|
||||||
|
if (!tenantManager.isMultitenantMode()) {
|
||||||
|
updateLicense();
|
||||||
|
- fs.watchFile(cfgLicenseFile, updateLicense);
|
||||||
|
+
|
||||||
|
setInterval(updateLicense, 86400000);
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
|
||||||
|
index 2a0b366..96468f9 100644
|
||||||
|
--- a/FileConverter/sources/convertermaster.js
|
||||||
|
+++ b/FileConverter/sources/convertermaster.js
|
||||||
|
@@ -93,7 +93,6 @@ if (cluster.isMaster) {
|
||||||
updateLicense();
|
updateLicense();
|
||||||
|
|
||||||
- fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
|
if (!tenantManager.isMultitenantMode()) {
|
||||||
setInterval(updateLicense, 86400000);
|
- fs.watchFile(cfgLicenseFile, updateLicense);
|
||||||
|
setInterval(updateLicense, 86400000);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
const converter = require('./converter');
|
diff --git a/Makefile b/Makefile
|
||||||
diff --git a/Makefile b/Makefile
|
index e8e1308..a4b0a51 100644
|
||||||
index e8e1308..23f7e2e 100644
|
--- a/Makefile
|
||||||
--- a/Makefile
|
+++ b/Makefile
|
||||||
+++ b/Makefile
|
@@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js
|
||||||
@@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js
|
.PHONY: all clean install uninstall build-date
|
||||||
.PHONY: all clean install uninstall build-date
|
|
||||||
|
.NOTPARALLEL:
|
||||||
.NOTPARALLEL:
|
-all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date
|
||||||
-all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date
|
+all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(WELCOME) $(INFO) build-date
|
||||||
+all: $(SCHEMA) $(LICENSE) $(WELCOME) $(INFO) build-date
|
|
||||||
|
build-date: $(GRUNT_FILES)
|
||||||
build-date: $(GRUNT_FILES)
|
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
|
||||||
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
|
--
|
||||||
|
2.31.1.windows.1
|
||||||
|
|
||||||
|
|
|
||||||
1629
web-apps.patch
1629
web-apps.patch
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue