7.2 patch

server.patch

@@ -1,9 +1,22 @@
+From 3c58d272005a300ad8fe575457d5ce25710833e9 Mon Sep 17 00:00:00 2001
+From: Beeant <huangxb0512@gmail.com>
+Date: Sat, 24 Sep 2022 21:38:51 +0800
+Subject: [PATCH] build: license
+
+---
+ 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 0663ead..490582a 100644
+index 65d4c6f..39a7e56 100644
 --- a/Common/sources/constants.js
 +++ b/Common/sources/constants.js
-@@ -75,7 +75,7 @@ exports.LICENSE_RESULT = {
+@@ -83,7 +83,7 @@ exports.LICENSE_RESULT = {
-   ExpiredLimited: 11
+   UsersViewCountOS: 15
  };
  
 -exports.LICENSE_CONNECTIONS = 20;
@@ -12,10 +25,10 @@ index 0663ead..490582a 100644
  
  exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
 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
 +++ b/Common/sources/license.js
-@@ -45,20 +45,20 @@ exports.readLicense = function*() {
+@@ -45,22 +45,22 @@ exports.readLicense = function*() {
  		count: 1,
  		type: c_LR.Success,
  		light: false,
@@ -25,10 +38,12 @@ index c273afe..8786f62 100644
 -		branding: false,
 +		branding: true,
  		connections: constants.LICENSE_CONNECTIONS,
+ 		connectionsView: constants.LICENSE_CONNECTIONS,
 -		customization: false,
 -		usersCount: 0,
 +		customization: true,
 +		usersCount: constants.LICENSE_CONNECTIONS,
+ 		usersViewCount: 0,
  		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
 -		hasLicense: false,
 -		plugins: false,
@@ -37,62 +52,40 @@ index c273afe..8786f62 100644
  		buildDate: oBuildDate,
  		startDate: startDate,
 -		endDate: null,
--		customerId: ""
++		endDate: new Date("2099-01-01T23:59:59.000Z"),
-+		customerId: "",
+ 		customerId: ""
-+		endDate: new Date("2099-01-01T23:59:59.000Z")
  	}, null];
  };
  
 -exports.packageType = constants.PACKAGE_TYPE_OS;
 +exports.packageType = constants.PACKAGE_TYPE_I;
-diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
-index b654c9c..31bdf2d 100644
---- a/DocService/sources/DocsCoServer.js
-+++ b/DocService/sources/DocsCoServer.js
-@@ -165,7 +165,7 @@ let connections = []; // Активные соединения
- 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
+index cf3ba90..d256724 100644
 --- a/DocService/sources/server.js
 +++ b/DocService/sources/server.js
-@@ -147,7 +147,6 @@ try {
+@@ -110,7 +110,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
- } 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');
+ if (!tenantManager.isMultitenantMode()) {
- }
+ 	updateLicense();
--fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
+-	fs.watchFile(cfgLicenseFile, updateLicense);
- setInterval(updateLicense, 86400000);
++	
+ 	setInterval(updateLicense, 86400000);
+ }
  
- // Если захочется использовать 'development' и 'production',
 diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
-index 2c4526f..ec07464 100644
+index 2a0b366..96468f9 100644
 --- a/FileConverter/sources/convertermaster.js
 +++ b/FileConverter/sources/convertermaster.js
-@@ -85,7 +85,6 @@ if (cluster.isMaster) {
+@@ -93,7 +93,6 @@ if (cluster.isMaster) {
- 
    updateLicense();
  
--  fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
+   if (!tenantManager.isMultitenantMode()) {
-   setInterval(updateLicense, 86400000);
+-    fs.watchFile(cfgLicenseFile, updateLicense);
+     setInterval(updateLicense, 86400000);
+   }
  } else {
-   const converter = require('./converter');
 diff --git a/Makefile b/Makefile
-index e8e1308..23f7e2e 100644
+index e8e1308..a4b0a51 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js
@@ -100,7 +93,10 @@ index e8e1308..23f7e2e 100644
  
  .NOTPARALLEL:
 -all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date
-+all: $(SCHEMA) $(LICENSE) $(WELCOME) $(INFO) build-date
++all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(WELCOME) $(INFO) build-date
  
  build-date: $(GRUNT_FILES)
  	sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
+-- 
+2.31.1.windows.1
+