102 lines
3.5 KiB
Diff
102 lines
3.5 KiB
Diff
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 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 = 9999;
|
|
exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds
|
|
|
|
exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
|
|
diff --git a/Common/sources/license.js b/Common/sources/license.js
|
|
index fbd5ec8..203dcb0 100644
|
|
--- a/Common/sources/license.js
|
|
+++ b/Common/sources/license.js
|
|
@@ -45,22 +45,22 @@ exports.readLicense = function*() {
|
|
count: 1,
|
|
type: c_LR.Success,
|
|
light: false,
|
|
- packageType: constants.PACKAGE_TYPE_OS,
|
|
+ packageType: constants.PACKAGE_TYPE_I,
|
|
mode: constants.LICENSE_MODE.None,
|
|
- 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,
|
|
+ hasLicense: true,
|
|
+ plugins: true,
|
|
buildDate: oBuildDate,
|
|
startDate: startDate,
|
|
- endDate: null,
|
|
+ endDate: new Date("2099-01-01T23:59:59.000Z"),
|
|
customerId: ""
|
|
}, null];
|
|
};
|
|
|
|
-exports.packageType = constants.PACKAGE_TYPE_OS;
|
|
+exports.packageType = constants.PACKAGE_TYPE_I;
|
|
diff --git a/DocService/sources/server.js b/DocService/sources/server.js
|
|
index cf3ba90..d256724 100644
|
|
--- a/DocService/sources/server.js
|
|
+++ b/DocService/sources/server.js
|
|
@@ -110,7 +110,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
|
|
|
|
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();
|
|
|
|
if (!tenantManager.isMultitenantMode()) {
|
|
- fs.watchFile(cfgLicenseFile, updateLicense);
|
|
setInterval(updateLicense, 86400000);
|
|
}
|
|
} else {
|
|
diff --git a/Makefile b/Makefile
|
|
index e8e1308..a4b0a51 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js
|
|
.PHONY: all clean install uninstall build-date
|
|
|
|
.NOTPARALLEL:
|
|
-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
|
|
|
|
build-date: $(GRUNT_FILES)
|
|
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
|
|
--
|
|
2.31.1.windows.1
|
|
|